diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js index 9f85f0e8..12eb2c04 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js @@ -583,6 +583,38 @@ export default { } } await load(); + } else if (item.path === "check") { + const urls = new Map(); + urls.set("JisBBAC", "settleaccount/bbac_ba_service/generate-invoice"); + urls.set("JisHBPO", "settleaccount/hbpo_ba_service/generate-invoice"); + urls.set("ZhiGongJianBBAC", "settleaccount/pub_ba_service/generate-invoice"); + urls.set("ZhiGongJianHBPO", "settleaccount/pub_ba_service/generate-invoice"); + urls.set("MaiDanJianHBPO", "settleaccount/pub_ba_service/generate-invoice"); + urls.set("BeiJian", "settleaccount/pub_ba_service/generate-invoice"); + urls.set("YinDuJian", "settleaccount/pub_ba_service/generate-invoice"); + try { + await ElMessageBox.confirm(format("确认审核通过选中的%s行数据吗？", rows.length), "提示", { + type: "warning", + }); + const response = await request( + urls.get(config.query.schema.properties.businessType?.default), + rows.map((o) => o.id), + { method: "POST" } + ); + if (!response.errors) { + ElMessage({ + type: "info", + message: "操作完毕", + }); + } + } catch (error) { + if (error === "cancel") { + ElMessage({ + type: "info", + message: "操作取消", + }); + } + } } else if (item.path === "export") { //export if (item.meta.pattern === "paged") { @@ -593,6 +625,8 @@ export default { if (!response.errors) { window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`)); } + } else if (item.meta.pattern === "file") { + window.open(getUrl(`settleaccount/getblobfile/download/${rows[0]["downFileName"]}`)); } else { console.log(item); } @@ -675,6 +709,9 @@ export default { if (config.query.schema.properties.businessType?.default) { formData.append("businessType", config.query.schema.properties.businessType.default); } + if (!router.currentRoute.value.path.startsWith("/base-data")) { + formData.append("version", queryModel.value.version); + } Object.keys(importModel.value).forEach((propertyName) => { if (importModel.value[propertyName]) { const schema = config.import.schema.properties[propertyName]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js index 9e3a7919..a7084f55 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js @@ -106,6 +106,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js index 9b6e048e..03f3f97f 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js @@ -107,6 +107,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js index fdd619e1..a1375de4 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js @@ -108,6 +108,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js index b2ef7804..5ed4cd45 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js @@ -81,6 +81,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js index 58e75c85..b818a73d 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js @@ -108,6 +108,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js index 9ef71893..9fae3076 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js @@ -82,6 +82,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js index b3ad91a0..d38ab70f 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js @@ -87,6 +87,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js index 59438329..1a3f395e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js @@ -56,7 +56,6 @@ const queryUrl = `${baseUrl}/detail-query`; const queryMethod = "POST"; - export default function () { return { query: { @@ -109,6 +108,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js index 48623a4b..f8088f76 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js @@ -107,6 +107,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js index e5318eb4..35f33181 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js @@ -109,6 +109,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js index 0f05c2af..6e7b82d7 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js @@ -25,11 +25,11 @@ const schema = { const baseUrl = "settleaccount/hbpo_can_sa_service"; const queryUrl = `${baseUrl}/main-query`; const exportUrl = `${baseUrl}/export`; -const invoiceUrl="settleaccount/hbpo_can_sa_service/generate-invoice"; +const invoiceUrl = "settleaccount/hbpo_can_sa_service/generate-invoice"; const queryMethod = "POST"; const exportMethod = "POST"; -const invoiceMethod="POST"; +const invoiceMethod = "POST"; export default function () { return { @@ -83,6 +83,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js index 6b65e1d6..c3415a2d 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js @@ -108,6 +108,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js index 8faa4363..b0af23bf 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js @@ -82,6 +82,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js index 3b27421d..cd02e803 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js @@ -87,6 +87,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js index 9baaba15..d01b31df 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js @@ -125,6 +125,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js index 3837dc64..546fa078 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js @@ -104,6 +104,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js index 0ceb12e6..c24d570b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js @@ -113,6 +113,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_service.js index dfb893b9..bba28d6e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_service.js @@ -85,6 +85,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_not_sa_service.js index be13db11..6f886ab8 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_not_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_not_sa_service.js @@ -127,6 +127,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_detail_service.js index 5847afa8..c2ca013c 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_detail_service.js @@ -6,34 +6,32 @@ const schema = { type: "object", properties: { site: { - title: "工厂地点", - type: "string", - }, + title: "工厂地点", + type: "string", + }, version, billNum: { title: "结算单号", type: "string", }, qty: { - title: "结算单号", - type: "decimal", - }, - price: { - title: "结算单号", - type: "decimal", - }, - invGroupNum: { - title: "结算单号", - type: "string", - }, - + title: "结算单号", + type: "decimal", + }, + price: { + title: "结算单号", + type: "decimal", + }, + invGroupNum: { + title: "结算单号", + type: "string", + }, }, }; const queryUrl = "settleaccount/p-uB_PD_SERVICE/detail-query"; const queryMethod = "POST"; - export default function () { return { query: { @@ -86,6 +84,10 @@ export default function () { sorting: { hidden: true, }, + businessType: { + hidden: true, + default: 0, + }, }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_service.js index 9424d11d..96cd91cf 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_pd_service.js @@ -27,6 +27,10 @@ const schema = { title: "业务类型", type: "EnumBusinessType", }, + businessType: { + hidden: true, + default: 0, + }, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index dbd985b0..99763e0c 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -209,7 +209,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", disabled: "o=>o.stateName!='Succeeded'", }, }, @@ -265,7 +265,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -425,12 +425,11 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", icon: "file", - isTop: true, }, }, { @@ -500,13 +499,12 @@ export default [ }, }, { - path: "passed ", + path: "check", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -745,7 +743,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -800,7 +798,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -960,7 +958,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -1035,13 +1033,12 @@ export default [ }, }, { - path: "passed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -1259,7 +1256,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -1429,7 +1426,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -1504,13 +1501,12 @@ export default [ }, }, { - path: "approvalPassed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -1720,7 +1716,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -1890,7 +1886,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -1965,13 +1961,12 @@ export default [ }, }, { - path: "approvalPassed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -2201,7 +2196,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -2401,7 +2396,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -2571,7 +2566,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -2646,13 +2641,12 @@ export default [ }, }, { - path: "approvalPassed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -2865,7 +2859,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -3005,7 +2999,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -3080,13 +3074,12 @@ export default [ }, }, { - path: "approvalPassed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -3296,7 +3289,7 @@ export default [ type: "button", title: "下载", icon: "file", - pattern: "paged", + pattern: "file", }, }, ], @@ -3436,7 +3429,7 @@ export default [ }, }, { - path: "passed", + path: "check", meta: { type: "button", title: "审核通过", @@ -3511,13 +3504,12 @@ export default [ }, }, { - path: "approvalPassed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, ], @@ -3591,13 +3583,12 @@ export default [ }, }, { - path: "passed ", + path: "check ", meta: { type: "button", title: "审核通过", icon: "file", isTop: true, - pattern: "paged", }, }, { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_second_pub_sa_detail_jobservice.js deleted file mode 100644 index 976e6f9f..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_second_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,16 +0,0 @@ -import AppList from "../../../components/list/index.js"; -import html from "html"; -import useConfig from "../../../models/job-service.js"; - -export default { - components: { AppList }, - template: html``, - setup() { - const config = useConfig(); - config.query.schema.title = "发运与结算二次"; - const onCommand = async (item, rows) => { - console.log(item.path, item, rows); - }; - return { config, onCommand }; - }, -}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js index eee29220..ceece8e2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js @@ -38,7 +38,6 @@ export default { setup() { const addDialogVisible = ref(false); const addAdjFormRef = ref(null); - const adjList = ref([]); const submitAdj = async () => { try { const url = "settleaccount/vmi/replenished-export"; @@ -89,7 +88,6 @@ export default { defaultAdjModel, adjModel, addAdj, - adjList, }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js index 2531f506..1fd7b687 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js @@ -1,16 +1,22 @@ import AppList from "../../../components/list/index.js"; import html from "html"; import useConfig from "../../../models/bbac-edi-se-compare.js"; +import { ref, onMounted, onUnmounted } from "vue"; export default { components: { AppList }, - template: html``, + template: html``, setup() { const config = useConfig(); config.query.schema.title = "EDI与发运数据"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; - return { config, onCommand }; + // + const appListRef = ref(null); + const event = "SaSeCompare"; + onMounted(() => PubSub.subscribe(event, async () => await appListRef.value.load())); + onUnmounted(() => PubSub.unsubscribe(event)); + return { config, onCommand, appListRef }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js index 7bafe5af..d77b79ca 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js @@ -1,16 +1,22 @@ import AppList from "../../../components/list/index.js"; import html from "html"; import useConfig from "../../../models/job-service.js"; +import { ref, onMounted, onUnmounted } from "vue"; export default { components: { AppList }, - template: html``, + template: html``, setup() { const config = useConfig(); config.query.schema.title = "EDI、发运与结算"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; - return { config, onCommand }; + // + const appListRef = ref(null); + const event = "SaSeCompare"; + onMounted(() => PubSub.subscribe(event, async () => await appListRef.value.load())); + onUnmounted(() => PubSub.unsubscribe(event)); + return { config, onCommand, appListRef }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js deleted file mode 100644 index 75aaa82a..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js +++ /dev/null @@ -1,16 +0,0 @@ -import AppList from "../../../components/list/index.js"; -import html from "html"; -import useConfig from "../../../models/job-service.js"; - -export default { - components: { AppList }, - template: html``, - setup() { - const config = useConfig(); - config.query.schema.title = "发运与结算数据二次"; - const onCommand = async (item, rows) => { - console.log(item.path, item, rows); - }; - return { config, onCommand }; - }, -}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js deleted file mode 100644 index 7f5434c3..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js +++ /dev/null @@ -1,16 +0,0 @@ -import AppList from "../../../components/list/index.js"; -import html from "html"; -import useConfig from "../../../models/job-service.js"; - -export default { - components: { AppList }, - template: html``, - setup() { - const config = useConfig(); - config.query.schema.title = "买单件发运与结算数据三次"; - const onCommand = async (item, rows) => { - console.log(item.path, item, rows); - }; - return { config, onCommand }; - }, -}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js index 7bafe5af..d77b79ca 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js @@ -1,16 +1,22 @@ import AppList from "../../../components/list/index.js"; import html from "html"; import useConfig from "../../../models/job-service.js"; +import { ref, onMounted, onUnmounted } from "vue"; export default { components: { AppList }, - template: html``, + template: html``, setup() { const config = useConfig(); config.query.schema.title = "EDI、发运与结算"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; - return { config, onCommand }; + // + const appListRef = ref(null); + const event = "SaSeCompare"; + onMounted(() => PubSub.subscribe(event, async () => await appListRef.value.load())); + onUnmounted(() => PubSub.unsubscribe(event)); + return { config, onCommand, appListRef }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js index f6f146ef..870debd2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js @@ -1,16 +1,22 @@ import AppList from "../../../components/list/index.js"; import html from "html"; import useConfig from "../../../models/hbpo-edi-se-compare.js"; +import { ref, onMounted, onUnmounted } from "vue"; export default { components: { AppList }, - template: html``, + template: html``, setup() { const config = useConfig(); config.query.schema.title = "EDI与发运数据"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; - return { config, onCommand }; + // + const appListRef = ref(null); + const event = "SaSeCompare"; + onMounted(() => PubSub.subscribe(event, async () => await appListRef.value.load())); + onUnmounted(() => PubSub.unsubscribe(event)); + return { config, onCommand, appListRef }; }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js deleted file mode 100644 index 75aaa82a..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js +++ /dev/null @@ -1,16 +0,0 @@ -import AppList from "../../../components/list/index.js"; -import html from "html"; -import useConfig from "../../../models/job-service.js"; - -export default { - components: { AppList }, - template: html``, - setup() { - const config = useConfig(); - config.query.schema.title = "发运与结算数据二次"; - const onCommand = async (item, rows) => { - console.log(item.path, item, rows); - }; - return { config, onCommand }; - }, -}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/md-hbpo/settlement/hbpo_md_pub_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/md-hbpo/settlement/hbpo_md_pub_ba_service.js index e55ea855..671cdd3c 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/md-hbpo/settlement/hbpo_md_pub_ba_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/md-hbpo/settlement/hbpo_md_pub_ba_service.js @@ -10,6 +10,7 @@ export default { const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; + config.query.schema.properties.businessType.default = "MaiDanJianHBPO"; return { config, onCommand }; }, -}; \ No newline at end of file +};