From c5d72b9e11cb05503a61b13a05587305b3ca80af Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 11 Sep 2023 13:58:58 +0800 Subject: [PATCH 1/2] update --- .../wwwroot/components/table/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 859d9289..d0d518c0 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 @@ -18,7 +18,7 @@ export default {
-
{{item.title}}
+
{{item.title}}
From a932e121e215abdefc528ec042663682c1b5bd77 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 11 Sep 2023 15:46:45 +0800 Subject: [PATCH 2/2] update --- .../wwwroot/models/input/jie-suan.js | 140 +++++++++--------- .../wwwroot/router/business.js | 4 +- 2 files changed, 74 insertions(+), 70 deletions(-) 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 1269bd3e..9d6bd941 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 @@ -1,70 +1,5 @@ import businessType, { version, state } from "../_options.js"; -const schema = { - title: "结算数据", - type: "object", - properties: { - version, - //state, - billNum: { - title: "结算单号", - type: "string", - oneToMany: "/input/jie-suan/detail", - config: "/models/input/jie-suan-detail.js", - }, - 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; @@ -87,17 +22,86 @@ export default function (businessType, meta) { const importMethod = "POST"; const exportMethod = "POST"; + const schema = { + title: "结算数据", + type: "object", + properties: { + version, + //state, + billNum: { + title: "结算单号", + type: "string", + oneToMany: "/input/jie-suan/detail", + config: "/models/input/jie-suan-detail.js", + }, + 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, + }, + }, + }; + const importSchema = { properties: { version: Object.assign(version, { rules: [{ required: true }] }), }, }; - if (meta.client === "bbac-104" || meta.client === "bbac-1046") { + if (meta.client === "bbac-1040" || meta.client === "bbac-1046") { schema.properties.site = importSchema.properties.site = { type: "number", - options: [], + options: [ + { label: 1040, value: 1040 }, + { label: 1046, value: 1046 }, + ], + input: "select", hidden: true, - default: meta.client === "bbac-104" ? 104 : 1046, + default: meta.client === "bbac-1040" ? 1040 : 1046, }; querySchema.properties.filters.default.push({ logic: "and", 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 30062b50..3716de54 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 @@ -148,7 +148,7 @@ export default [ { ...createRoute("input", "title=数据输入"), children: [ - createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac-104", "JIS-BBAC 结算数据"), + createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac-1040", "JIS-BBAC 结算数据"), createInputJieSuanShuju("bbac_sa_service2", "JisBBAC", "bbac-1046", "JIS-BBAC顺义 结算数据"), createInputFaYunShuJu("bbac_se_detail_service", "JisBBAC", "bbac", "JIS-BBAC 发运数据"), createInputEdiShuJu("bbac_se_edi_service", "JisBBAC", "bbac", "JIS-BBAC EDI数据"), @@ -210,7 +210,7 @@ export default [ { ...createRoute("input", "title=数据输入"), children: [ - createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-104", "直供件-BBAC 结算数据"), + createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-1040", "直供件-BBAC 结算数据"), createInputJieSuanShuju("bbac_jit_pub_sa_service2", "ZhiGongJianBBAC", "bbac-1046", "直供件-BBAC顺义 结算数据"), createInputFaYunShuJu("bbac_jit_pub_se_detail_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 发运数据"), ],