From befb4571b792234eb9364e04f55d9cd2764718dc Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 8 Sep 2023 08:59:51 +0800 Subject: [PATCH 1/2] up --- .../wwwroot/views/home.js | 11 +---- .../wwwroot/views/settle/_check.js | 43 ++++++++----------- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js index 189b7337..b1834c20 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js @@ -21,20 +21,13 @@ export default { if (input) { result.push({ ...createRoute("input", "数据输入"), - children: [ - { ...createRoute("jie-suan", "结算数据", page) }, - { ...createRoute("fa-yun", "发运数据", page) }, - { ...createRoute("edi", "EDI数据", page) }, - ], + children: [{ ...createRoute("jie-suan", "结算数据", page) }, { ...createRoute("fa-yun", "发运数据", page) }, { ...createRoute("edi", "EDI数据", page) }], }); } if (compare) { result.push({ ...createRoute("compare", "数据比对"), - children: [ - { ...createRoute("fa-yun", "EDI与发运数据", page) }, - { ...createRoute("jie-suan", "EDI、发运与计算数据比对", page) }, - ], + children: [{ ...createRoute("fa-yun", "EDI与发运数据", page) }, { ...createRoute("jie-suan", "EDI、发运与计算数据比对", page) }], }); } if (settle) { 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 347d2b86..bb8b4e7e 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 @@ -104,7 +104,7 @@ export default { {{setup3Model.businesType}} {{setup3Model.businesType}} - + @@ -127,7 +127,7 @@ export default { 上一步 - 下一步 + 下一步 @@ -564,6 +564,14 @@ export default { } }; const next = async () => { + let service = null; + if (props.businessType === "JisBBAC") { + service = "bbac_ba_service"; + } else if (props.usinessType === "JisHBPO") { + service = "hbpo_ba_service"; + } else { + service = "pub_ba_service"; + } if (setupRef.value === 1) { try { // setupRef.value += 1; @@ -587,47 +595,32 @@ export default { }); }); } else if (result.data?.code === 400) { - ElMessage({ - type: "error", - message: "操作失败", - }); + // ElMessage({ + // type: "error", + // message: "操作失败", + // }); window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); } } catch (e) { console.log(e); } } else if (setupRef.value === 2) { - let service = null; - if (props.businessType === "JisBBAC") { - service = "bbac_ba_service"; - } else if (props.usinessType === "JisHBPO") { - service = "hbpo_ba_service"; - } else { - service = "pub_ba_service"; - } - const url = `settleaccount/${service}}/reissue-invoice-list`; + const url = `settleaccount/${service}/reissue-invoice-list`; const result = await request(url, adjList.value, { method: "POST" }); if (!result.errors) { //setup3的数据来源 - setup3Model.value = result.data.data; + setup3Model.value = result.data; + setup3Model.value.detail = adjList.value; setupRef.value += 1; } else if (result.data?.code === 400 && result.data.fileName) { - ElMessage({ - type: "error", - message: "操作失败", - }); window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); } } else if (setupRef.value === 3) { - const url = `settleaccount/${service}}/reissue-invoice-extend`; + const url = `settleaccount/${service}/reissue-invoice-extend`; const result = await request(url, adjList.value, { method: "POST" }); if (!result.errors) { setupRef.value += 1; } else if (result.data?.code === 400 && result.data.fileName) { - ElMessage({ - type: "error", - message: "操作失败", - }); window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`)); } } else { From e4d171b6bb9e53992949390aa488b8d7fda3be73 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 8 Sep 2023 10:27:27 +0800 Subject: [PATCH 2/2] up --- .../wwwroot/views/settle/_check.js | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) 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 bb8b4e7e..11ee5aee 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 @@ -19,7 +19,6 @@ export default { - @@ -83,7 +82,7 @@ export default { - + @@ -97,14 +96,20 @@ export default { - - {{setup3Model.invbillNum}} - {{businessTypes.options.find(o=>o.value===setup3Model.businesType)?.label}} - {{setup3Model.tax}} - {{setup3Model.businesType}} - {{setup3Model.businesType}} - - + + + @@ -193,7 +198,9 @@ export default { watch(show, (value) => context.emit("update:modelValue", value)); const loading = ref(false); const model = ref({ - invoicE_WAIT_DETAIL: [], + invoicE_WAIT_DETAIL: null, + invoicE_WAIT_DETAIL_BBAC: null, + invoicE_WAIT_DETAIL_BJ: null, invoicE_MAP_GROUP: [], invoicE_NOT_SETTLE: [], adJ_DETAIL: [], @@ -610,7 +617,6 @@ export default { if (!result.errors) { //setup3的数据来源 setup3Model.value = result.data; - setup3Model.value.detail = adjList.value; setupRef.value += 1; } else if (result.data?.code === 400 && result.data.fileName) { window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));