From a105ca536707a0dd23d21824d0daecb35e44e4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Fri, 21 Jul 2023 10:59:36 +0800 Subject: [PATCH 1/3] update --- .../wwwroot/components/list/index.js | 2 +- .../contrast/bj_pub_sa_detail_jobservice.js | 132 ----------------- .../bj_second_pub_sa_detail_jobservice.js | 132 ----------------- .../contrast/in_pub_sa_detail_jobservice.js | 132 ----------------- .../in_second_pub_sa_detail_jobservice.js | 132 ----------------- .../first_bbac_sa_detail_jobservice.js | 137 ------------------ .../second_bbac_sa_detail_jobservice.js | 137 ------------------ .../third_bbac_sa_detail_jobservice.js | 137 ------------------ .../contrast/first_hbpo_sa_detail_service.js | 137 ------------------ .../contrast/hbpo_sa_detail_service.js | 137 ------------------ .../contrast/second_hbpo_sa_detail_service.js | 137 ------------------ .../contrast/jit_pub_sa_detail_jobservice.js | 132 ----------------- .../jit_second_pub_sa_detail_jobservice.js | 132 ----------------- ...sa_detail_jobservice.js => job-service.js} | 76 ++++------ .../wwwroot/router/business.js | 1 - .../contrast/bj_pub_sa_detail_jobservice.js | 3 +- .../bj_second_pub_sa_detail_jobservice.js | 3 +- .../contrast/in_pub_sa_detail_jobservice.js | 3 +- .../in_second_pub_sa_detail_jobservice.js | 3 +- .../contrast/bbac_sa_detail_jobservice.js | 3 +- .../first_bbac_sa_detail_jobservice.js | 3 +- .../second_bbac_sa_detail_jobservice.js | 3 +- .../third_bbac_sa_detail_jobservice.js | 3 +- .../first_hbpo_sa_detail_jobservice.js | 3 +- .../contrast/hbpo_sa_detail_jobservice.js | 3 +- .../second_hbpo_sa_detail_jobservice.js | 3 +- .../contrast/jit_pub_sa_detail_jobservice.js | 3 +- .../jit_second_pub_sa_detail_jobservice.js | 3 +- 28 files changed, 58 insertions(+), 1674 deletions(-) delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_pub_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_pub_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/{jis-bbac/contrast/bbac_sa_detail_jobservice.js => job-service.js} (68%) 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 903e94cd..d37bc1e8 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 @@ -836,7 +836,7 @@ export default { if (props.query) { Object.assign(queryModel.value.query, props.query); } - if (!route.meta.disableQueryOnLoad) { + if (!config.query.disableQueryOnLoad) { await load(); } }); diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js deleted file mode 100644 index b8c925af..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js +++ /dev/null @@ -1,137 +0,0 @@ -const schema = { - title: "期间设置", - type: "object", - properties: { - year: { - title: "年度", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - period: { - title: "期间", - type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - version: { - title: "版本", - type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], - }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/centralized-control"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; - -export default function () { - return { - baseUrl, - query: { - url: queryUrl, - method: queryMethod, - hasFilter: true, - schema: { - title: "期间设置", - type: "object", - properties: { - filters: { - type: "array", - hidden: true, - items: { - type: "object", - properties: { - logic: { - type: "int", - }, - column: { - type: "string", - }, - action: { - type: "int", - }, - value: { - type: "string", - }, - }, - }, - default: [ - { - logic: "and", - column: "year", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js deleted file mode 100644 index a6375733..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js +++ /dev/null @@ -1,132 +0,0 @@ -const schema = { - title: "通用代码", - type: "object", - properties: { - project: { - title: "项目", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - value: { - title: "值", - type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], - }, - description: { - title: "描述", - type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], - }, - }, -}; - -const baseUrl = "settleaccount/code-setting"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; -const deleteUrl = `${baseUrl}/delete-list`; -const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/export`; -const queryMethod = "POST"; -const detailsMethod = "POST"; -const createMethod = "POST"; -const updateMethod = "POST"; -const deleteMethod = "POST"; -const importMethod = "POST"; -const exportMethod = "POST"; - -export default function () { - 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: "project", - action: "like", - value: null, - readOnly: true, - }, - ], - }, - skipCount: { - hidden: true, - default: 0, - }, - maxResultCount: { - hidden: true, - default: 10, - }, - sorting: { - hidden: true, - }, - }, - }, - }, - table: { - schema: schema, - }, - edit: { - detailsUrl, - createUrl, - updateUrl, - deleteUrl, - importUrl, - exportUrl, - detailsMethod, - createMethod, - updateMethod, - deleteMethod, - importMethod, - exportMethod, - schema: schema, - }, - }; -} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js similarity index 68% rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js index 6ea2dd2d..1fc4c4b6 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js @@ -1,62 +1,47 @@ -import version from "../../../models/version.js"; +import version from "./version.js"; + +const stateName = { + title: "状态", + type: "string", + input: "select", + options: [ + { text: "执行完成(任务成功)", value: "Succeeded" }, + { text: "执行完成(任务失败)", value: "Failed" }, + { text: "执行中", value: "Processing" }, + { text: "等待执行", value: "Enqueued" }, + ], +}; const schema = { title: "期间设置", type: "object", properties: { - year: { - title: "年度", + type: { + title: "版本号", type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], }, - period: { - title: "期间", + taskId: { + title: "单据流水号", type: "string", - hidden: true, - showForList: true, - rules: [ - { - required: true, - }, - ], }, - version: { - title: "版本", + email: { + title: "创建人", type: "string", - input: "month", - format: "YYYYMM", - showForList: true, - watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}", - rules: [ - { - required: true, - trigger: "blur", - }, - ], }, - state: { - title: "状态", - type: "boolean", - showForList: true, - default: true, - rules: [ - { - required: true, - }, - ], + createdAt: { + title: "创建时间", + type: "DateTime", + }, + remark: { + title: "说明", + type: "string", }, + stateName, }, }; -const baseUrl = "settleaccount/centralized-control"; const queryUrl = "settleaccount/Job/list"; -const deleteUrl = `${baseUrl}/delete-list`; +const deleteUrl = "settleaccount/Job/delete"; const exportUrl = "settleaccount/pub_sa_detail_service/export"; const compareUrl = "settleaccount/pub_sa_detail_service/pub-sa-se-compare"; const queryMethod = "POST"; @@ -66,12 +51,12 @@ const compareMethod = "POST"; export default function () { return { - baseUrl, query: { url: queryUrl, method: queryMethod, - hasFilter: true, + autoSubmit: true, + disableQueryOnLoad: true, schema: { title: "期间设置", type: "object", @@ -82,6 +67,7 @@ export default function () { default: null, hidden: true, }, + stateName, filters: { type: "array", hidden: true, 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 411054f9..8283ae50 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 @@ -184,7 +184,6 @@ export default [ title: "EDI与发运数据对比", icon: "file", enumBusinessType: "BBAC", - disableQueryOnLoad: true, }, children: [ { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js index b477004c..eae396a2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bj/contrast/bj_pub_sa_detail_jobservice.js"; +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); }; 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 index a3013f33..676f5f6b 100644 --- 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 @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bj/contrast/bj_second_pub_sa_detail_jobservice.js"; +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); }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js index 46e906ed..eae396a2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/in/contrast/in_pub_sa_detail_jobservice.js"; +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); }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js index e8dfc9e8..676f5f6b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/in/contrast/in_second_pub_sa_detail_jobservice.js"; +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); }; 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 b64dfd9e..e06d7124 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,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-bbac/contrast/bbac_sa_detail_jobservice.js"; +import useConfig from "../../../models/job-service.js"; export default { components: { AppList }, template: html``, setup() { const config = useConfig(); + config.query.schema.title = "EDI与发运数据对比"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; 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 909d17c2..131ebe29 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,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js"; +import useConfig from "../../../models/job-service.js"; export default { components: { AppList }, template: html``, setup() { const config = useConfig(); + config.query.schema.title = "EDI、发运与结算对比"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; 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 index 0bbd59e3..f2accac4 100644 --- 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 @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js"; +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); }; 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 index 7f7ede4f..65155817 100644 --- 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 @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js"; +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); }; 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 745c0abc..131ebe29 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,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js"; +import useConfig from "../../../models/job-service.js"; export default { components: { AppList }, template: html``, setup() { const config = useConfig(); + config.query.schema.title = "EDI、发运与结算对比"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; 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 f4af77ab..e06d7124 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,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-hbpo/contrast/hbpo_sa_detail_service.js"; +import useConfig from "../../../models/job-service.js"; export default { components: { AppList }, template: html``, setup() { const config = useConfig(); + config.query.schema.title = "EDI与发运数据对比"; const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; 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 index 32bd33ad..f2accac4 100644 --- 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 @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js"; +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); }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js index 71900cc7..eae396a2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jit/contrast/jit_pub_sa_detail_jobservice.js"; +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); }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js index ea571880..676f5f6b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js @@ -1,12 +1,13 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/jit/contrast/jit_second_pub_sa_detail_jobservice.js"; +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); }; From 85f84f568ec268a31dbfe619bca601898ae60c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Fri, 21 Jul 2023 11:09:52 +0800 Subject: [PATCH 2/3] update --- .../wwwroot/models/job-service.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js index 1fc4c4b6..1b13d9be 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js @@ -5,10 +5,10 @@ const stateName = { type: "string", input: "select", options: [ - { text: "执行完成(任务成功)", value: "Succeeded" }, - { text: "执行完成(任务失败)", value: "Failed" }, - { text: "执行中", value: "Processing" }, - { text: "等待执行", value: "Enqueued" }, + { label: "执行完成(任务成功)", value: "Succeeded" }, + { label: "执行完成(任务失败)", value: "Failed" }, + { label: "执行中", value: "Processing" }, + { label: "等待执行", value: "Enqueued" }, ], }; From e810b27f3a582975f057fdc3e3b4599ddd3f33c9 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 21 Jul 2023 11:20:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E7=AD=9B=E9=80=89=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/components/list/index.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 d37bc1e8..f0496fb2 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 @@ -105,7 +105,12 @@ export default {