diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js index cec0888d..8e7b6dd6 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js @@ -11,7 +11,7 @@ import businessTypes from "../../models/_options.js"; export default { components: { AppForm, AppTable }, - template: html` + template: html` @@ -54,7 +54,7 @@ export default { - + @@ -121,7 +121,7 @@ export default { @@ -137,7 +137,7 @@ export default { - + @@ -193,7 +193,7 @@ export default { } `, props: ["modelValue", "row", "data", "isBusiness", "businessType"], - emit: ["update:modelValue"], + emit: ["update:modelValue", "complete"], setup(props, context) { const show = ref(props.modelValue); watch(show, (value) => context.emit("update:modelValue", value)); @@ -266,13 +266,13 @@ export default { }, }; - const columns22 = Object.assign({}, columns2); + const columns22 = JSON.parse(JSON.stringify(columns2)); columns22.properties.extend1 = { type: "number", title: "SA号", }; - const columns23 = Object.assign({}, columns2); + const columns23 = JSON.parse(JSON.stringify(columns2)); columns23.properties.extend1 = { type: "number", title: "凭证号", @@ -631,7 +631,7 @@ export default { } else if (result.data?.code === 400 && result.data.fileName) { window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); } - } else { + } else if (setupRef.value === 4) { setupDialogVisable.value = false; refreshRef.value = false; nextTick(() => { @@ -639,6 +639,9 @@ export default { }); } }; + const drawerClosed = () => { + context.emit("complete"); + }; // onMounted(async () => { loading.value = true; @@ -694,6 +697,7 @@ export default { refreshRef, setup3Model, businessTypes, + drawerClosed, }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js index 298a2d65..e9681655 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js @@ -9,7 +9,7 @@ import AppCheck from "./_check.js"; export default { components: { AppList, AppCheck }, template: html` - `, + `, setup() { const appListRef = ref(null); const visable = ref(false); @@ -57,6 +57,10 @@ export default { } console.log(item.path, item, rows); }; - return { appListRef, config, onCommand, visable, row, data, businessType }; + const complete = async () => { + visable.value = false; + await appListRef.value.reload(); + }; + return { appListRef, config, onCommand, visable, row, data, businessType, complete }; }, };