From d2fa18e4789d414a519c98ebd9552416d75729e7 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 22 Aug 2023 18:05:29 +0800 Subject: [PATCH] update --- .../wwwroot/components/list/index.js | 5 - .../wwwroot/models/input/jie-suan.js | 128 ++++++++++-------- .../wwwroot/router/business.js | 2 +- .../wwwroot/views/_list.js | 2 +- 4 files changed, 76 insertions(+), 61 deletions(-) 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 6b1b82d3..b6b852fa 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 @@ -670,11 +670,6 @@ export default { if (route.meta.businessType) { formData.append("businessType", route.meta.businessType); } - if (route.meta.client === "bbac-104") { - formData.append("site", "104"); - } else if (route.meta.client === "bbac-1046") { - formData.append("site", "1046"); - } 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/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js index 89972e00..50b2b2c5 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js @@ -16,7 +16,56 @@ const schema = { }, }; -export default function (businessType) { +const querySchema = { + title: "结算数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "equal", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, +}; + +export default function (businessType, meta) { let service = null; let detailService = null; if (businessType === "JisBBAC") { @@ -38,69 +87,40 @@ export default function (businessType) { const importMethod = "POST"; const exportMethod = "POST"; + const importSchema = { + properties: { + version: Object.assign(version, { rules: [{ required: true }] }), + }, + }; + if (meta.client === "bbac-104" || meta.client === "bbac-1046") { + schema.properties.site = importSchema.properties.site = { + type: "number", + options: [], + hidden: true, + default: meta.client === "bbac-104" ? 104 : 1046, + }; + querySchema.properties.filters.default.push({ + logic: "and", + column: "site", + action: "equal", + hidden: true, + value: schema.properties.site.default, + readOnly: true, + }); + } + return { query: { url: queryUrl, method: queryMethod, hasFilter: true, - schema: { - title: "结算数据", - type: "object", - properties: { - filters: { - title: "项目", - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "version", - action: "equal", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, + schema: querySchema, }, table: { schema: schema, }, import: { - schema: { - properties: { - version: Object.assign(version, { rules: [{ required: true }] }), - }, - }, + schema: importSchema, }, edit: { deleteUrl, 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 e332f4a3..7db30121 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 @@ -188,7 +188,7 @@ export default [ ...createRoute("input", "title=数据输入"), children: [ createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-104", "直供件-BBAC 结算数据"), - createInputJieSuanShuju("bbac_jit_pub_sa_service2", "ZhiGongJianBBAC", "bbac-1046", "JIS-BBAC顺义 结算数据"), + createInputJieSuanShuju("bbac_jit_pub_sa_service2", "ZhiGongJianBBAC", "bbac-1046", "直供件-BBAC顺义 结算数据"), createInputFaYunShuJu("bbac_jit_pub_se_detail_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 发运数据"), ], }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_list.js index 9d47015c..a032f0a4 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_list.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_list.js @@ -15,7 +15,7 @@ export default function (model) { }; onMounted(async () => { const useConfig = (await import(`../models/${model}.js`)).default; - config.value = useConfig(route.meta?.businessType); + config.value = useConfig(route.meta?.businessType, route.meta); }); return { config, onCommand }; },