diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
index b3d816e9..600f5437 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
@@ -39,7 +39,7 @@ export default {
- {{dayjs(model[prop]).format('YYYY-MM-DD HH:mm:ss')}}
+ {{dayjs(model[key]).format('YYYY-MM-DD HH:mm:ss')}}
{{row[key]}}
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 0f1c39b9..6949efe6 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
@@ -8,6 +8,7 @@ import extraProperties from "../../models/_extraProperties.js";
import { getUrl } from "../../request/index.js";
import businessTypes from "../../models/_options.js";
import { required, trim } from "../../utils/validation.js";
+import { delay } from "../../utils/index.js";
export default {
components: { AppForm, AppTable },
@@ -51,6 +52,7 @@ export default {
报废重开
+ 报废重开
@@ -62,78 +64,80 @@ export default {
-
-
-
- 新建
- 导入
- 删除
-
-
-
-
-
-
+
+
+
+
+ 新建
+ 导入
+ 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.invbillNum}}
- {{businessTypes.options.find(o=>o.value===item.businesType)?.label}}
- {{item.amt}}
- {{item.taxAmt}}
- {{item.realAmt }}
- {{item.tax}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 返回
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.invbillNum}}
+ {{businessTypes.options.find(o=>o.value===item.businessType)?.label}}
+ {{item.amt}}
+ {{item.taxAmt}}
+ {{item.realAmt }}
+ {{item.tax}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+
+
+
@@ -155,7 +159,7 @@ export default {
导入调整明细
-
+
@@ -581,62 +585,64 @@ export default {
} else {
service = "pub_ba_service";
}
- if (setupRef.value === 1) {
- try {
- // setupRef.value += 1;
- // return; //临时
- //发到服务的校验
- const result = await request(`settleaccount/${service}/reissue-invoice-list`, adjList.value, { method: "POST" });
+ try {
+ loading.value = true;
+ if (setupRef.value === 1) {
+ try {
+ // setupRef.value += 1;
+ // return; //临时
+ //发到服务的校验
+ const result = await request(`settleaccount/${service}/reissue-invoice-list`, adjList.value, { method: "POST" });
+ if (!result.errors) {
+ adjList2.value = result.data.data;
+ setupRef.value += 1;
+ //处理高亮
+ nextTick(() => {
+ const list1 = setup2table1Ref.value.tableRef.querySelectorAll(".row.data");
+ const list2 = setup2table2Ref.value.tableRef.querySelectorAll(".row.data");
+ list1.forEach((o) => {
+ addDiff(o, list2, ".qty");
+ addDiff(o, list2, ".amt");
+ });
+ list2.forEach((o) => {
+ addDiff(o, list1, ".qty");
+ addDiff(o, list1, ".amt");
+ });
+ });
+ } else if (result.data?.code === 400 && result.data.fileName) {
+ window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
+ }
+ } catch (e) {
+ console.log(e);
+ }
+ } else if (setupRef.value === 2) {
+ const url = `settleaccount/${service}/reissue-invoice-list-ext`;
+ const result = await request(url, adjList.value, { method: "POST" });
if (!result.errors) {
- adjList2.value = result.data.data;
+ //setup3的数据来源
+ setup3Model.value = result.data.data;
setupRef.value += 1;
- //处理高亮
- nextTick(() => {
- const list1 = setup2table1Ref.value.tableRef.querySelectorAll(".row.data");
- const list2 = setup2table2Ref.value.tableRef.querySelectorAll(".row.data");
- list1.forEach((o) => {
- addDiff(o, list2, ".qty");
- addDiff(o, list2, ".amt");
- });
- list2.forEach((o) => {
- addDiff(o, list1, ".qty");
- addDiff(o, list1, ".amt");
- });
- });
- } else if (result.data?.code === 400) {
- // ElMessage({
- // type: "error",
- // message: "操作失败",
- // });
+ } else if (result.data?.code === 400 && result.data.fileName) {
window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
}
- } catch (e) {
- console.log(e);
- }
- } else if (setupRef.value === 2) {
- const url = `settleaccount/${service}/reissue-invoice-list-ext`;
- const result = await request(url, adjList.value, { method: "POST" });
- if (!result.errors) {
- //setup3的数据来源
- setup3Model.value = result.data.data;
- setupRef.value += 1;
- } else if (result.data?.code === 400 && result.data.fileName) {
- window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
- }
- } else if (setupRef.value === 3) {
- 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) {
- window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
+ } else if (setupRef.value === 3) {
+ 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) {
+ window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
+ }
+ } else if (setupRef.value === 4) {
+ setupDialogVisable.value = false;
+ refreshRef.value = false;
+ nextTick(() => {
+ refreshRef.value = true;
+ });
}
- } else if (setupRef.value === 4) {
- setupDialogVisable.value = false;
- refreshRef.value = false;
- nextTick(() => {
- refreshRef.value = true;
- });
+ } finally {
+ await delay(5000);
+ loading.value = false;
}
};
const drawerClosed = () => {