From 7fa63a39288d0d005f23fd8246e2b06402784810 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: Thu, 20 Jul 2023 10:07:55 +0800 Subject: [PATCH 01/12] update --- .../wwwroot/components/form/form-input.js | 4 +- .../contrast/bj_pub_sa_detail_jobservice.js} | 0 .../bj_second_pub_sa_detail_jobservice.js | 132 ++++++++++ .../bj/input/bj_pub_sa_detail_service.js | 132 ++++++++++ .../models/bj/input/bj_pub_sa_service.js | 132 ++++++++++ .../bj/input/bj_pub_se_detail_service.js | 132 ++++++++++ .../bj/settlement/bj_pub_ba_detail_service.js | 126 +++++++++ .../models/bj/settlement/bj_pub_ba_service.js | 128 +++++++++ .../bj/settlement/bj_pub_can_sa_service.js | 100 ++++++++ .../bj/settlement/bj_pub_not_sa_service.js | 126 +++++++++ .../models/bj/settlement/bj_pub_pd_service.js | 103 ++++++++ .../contrast/in_pub_sa_detail_jobservice.js | 132 ++++++++++ .../in_second_pub_sa_detail_jobservice.js | 132 ++++++++++ .../in/input/in_pub_sa_detail_service.js | 132 ++++++++++ .../models/in/input/in_pub_sa_service.js | 132 ++++++++++ .../in/input/in_pub_se_detail_service.js | 132 ++++++++++ .../models/in/settlement/in_pub_ba_service.js | 128 +++++++++ .../in_pub_can_sa_detail_service.js | 126 +++++++++ .../in/settlement/in_pub_can_sa_service.js | 100 ++++++++ .../in/settlement/in_pub_not_sa_service.js | 126 +++++++++ .../models/in/settlement/in_pub_pd_service.js | 103 ++++++++ .../models/invoice/invoice_map_group.js | 0 .../models/invoice/invoice_not_settle.js | 0 .../wwwroot/models/invoice/invoice_service.js | 131 ++++++++++ .../models/invoice/invoice_wait_detail.js | 0 .../contrast/bbac_sa_detail_jobservice.js | 137 ++++++++++ .../first_bbac_sa_detail_jobservice.js | 137 ++++++++++ .../second_bbac_sa_detail_jobservice.js | 137 ++++++++++ .../third_bbac_sa_detail_jobservice.js | 137 ++++++++++ .../jis-bbac/input/bbac_se_detail_service.js | 8 +- .../jis-bbac/settlement/bbac_ba_service.js | 23 +- .../settlement/bbac_can_sa_detail_service.js | 6 +- .../settlement/bbac_can_sa_service.js | 24 +- .../settlement/bbac_not_sa_service.js | 13 +- .../jis-bbac/settlement/bbac_pd_service.js | 19 +- .../contrast/first_hbpo_sa_detail_service.js | 137 ++++++++++ .../contrast/hbpo_sa_detail_service.js | 137 ++++++++++ .../contrast/second_hbpo_sa_detail_service.js | 137 ++++++++++ .../jis-hbpo/input/hbpo_se_detail_service.js | 8 +- .../jis-hbpo/settlement/hbpo_ba_service.js | 19 +- .../settlement/hbpo_can_sa_service.js | 23 +- .../settlement/hbpo_not_sa_service.js | 13 +- .../jis-hbpo/settlement/hbpo_pd_service.js | 13 +- .../contrast/jit_pub_sa_detail_jobservice.js | 132 ++++++++++ .../jit_second_pub_sa_detail_jobservice.js | 132 ++++++++++ .../jit/input/jit_jit_pub_sa_service.js | 132 ++++++++++ .../jit/input/jit_pub_sa_detail_service.js | 132 ++++++++++ .../jit/input/jit_pub_se_detail_service.js | 132 ++++++++++ .../settlement/jit_pub_ba_detail_service.js | 126 +++++++++ .../jit/settlement/jit_pub_ba_service.js | 128 +++++++++ .../jit/settlement/jit_pub_can_sa_service.js | 100 ++++++++ .../jit/settlement/jit_pub_not_sa_service.js | 126 +++++++++ .../jit/settlement/jit_pub_pd_service.js | 103 ++++++++ .../wwwroot/models/state.js | 14 + .../wwwroot/models/version.js | 8 + .../wwwroot/router/business.js | 242 +++++++++++------- .../contrast/bj_pub_sa_detail_jobservice.js | 15 ++ .../bj_second_pub_sa_detail_jobservice.js | 15 ++ .../bj/input/bj_pub_sa_detail_service.js | 15 ++ .../views/bj/input/bj_pub_sa_service.js | 15 ++ .../bj/input/bj_pub_se_detail_service.js | 15 ++ .../views/bj/settlement/bj_pub_ba_service.js | 15 ++ .../bj_pub_can_sa_detail_service.js | 15 ++ .../bj/settlement/bj_pub_can_sa_service.js | 15 ++ .../bj/settlement/bj_pub_not_sa_service.js | 15 ++ .../views/bj/settlement/bj_pub_pd_service.js | 15 ++ .../contrast/in_pub_sa_detail_jobservice.js | 15 ++ .../in_second_pub_sa_detail_jobservice.js | 15 ++ .../in/input/in_pub_sa_detail_service.js | 15 ++ .../views/in/input/in_pub_sa_service.js | 15 ++ .../in/input/in_pub_se_detail_service.js | 15 ++ .../views/in/settlement/in_pub_ba_service.js | 15 ++ .../in_pub_can_sa_detail_service.js | 15 ++ .../in/settlement/in_pub_can_sa_service.js | 15 ++ .../in/settlement/in_pub_not_sa_service.js | 15 ++ .../views/in/settlement/in_pub_pd_service.js | 15 ++ .../views/invoice/invoice_map_group.js | 0 .../views/invoice/invoice_not_settle.js | 0 .../wwwroot/views/invoice/invoice_service.js | 15 ++ .../views/invoice/invoice_wait_detail.js | 0 .../contrast/bbac_sa_detail_jobservice.js | 2 +- .../first_bbac_sa_detail_jobservice.js | 15 ++ .../second_bbac_sa_detail_jobservice.js | 15 ++ .../third_bbac_sa_detail_jobservice.js | 15 ++ .../first_hbpo_sa_detail_jobservice.js | 15 ++ .../contrast/hbpo_sa_detail_jobservice.js | 15 ++ .../second_hbpo_sa_detail_jobservice.js | 15 ++ .../contrast/jit_pub_sa_detail_jobservice.js | 15 ++ .../jit_second_pub_sa_detail_jobservice.js | 15 ++ .../views/jit/input/jit_jit_pub_sa_service.js | 15 ++ .../jit/input/jit_pub_sa_detail_service.js | 15 ++ .../jit/input/jit_pub_se_detail_service.js | 15 ++ .../jit/settlement/jit_pub_ba_service.js | 15 ++ .../jit_pub_can_sa_detail_service.js | 15 ++ .../jit/settlement/jit_pub_can_sa_service.js | 15 ++ .../jit/settlement/jit_pub_not_sa_service.js | 15 ++ .../jit/settlement/jit_pub_pd_service.js | 15 ++ .../Bases/CAN_SA_SERVICE.cs | 3 +- docs/ui.rp | Bin 537323 -> 539588 bytes 99 files changed, 5490 insertions(+), 194 deletions(-) rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/{.js => bj/contrast/bj_pub_sa_detail_jobservice.js} (100%) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_not_settle.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_wait_detail.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_jit_pub_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_pub_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_pub_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_service.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js index 24a7112c..93d71b6a 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js @@ -29,7 +29,7 @@ export default { - @@ -391,16 +406,22 @@ export default { const editFormTitle = ref(""); const editFormSchema = ref(null); const editFormModel = ref(null); - const exportModel = reactive({ - includeAll: false, - includeDeleted: false, - }); - const importModel = reactive({ - // partial: true, - // replace: false, + const defaultExportModel = { + version: "", + date1: "", + date2: "", + date3: "", + date4: "", + ln: "", + pn: "", + enumBusinessType: route.meta.enumBusinessType, + }; + const exportModel = ref(defaultExportModel); + const defaultImportModel = { factory: "", version: "", - }); + }; + const importModel = ref(defaultExportModel); const factories = ref([]); const versions = ref([]); const fileList = ref([]); @@ -550,7 +571,7 @@ export default { await load(); } else if (item.path === "export") { //export - if ((item.pattern = "paged")) { + if (item.pattern === "paged") { const url = config.edit.exportUrl; const method = config.edit.exportMethod; const postData = buildQuery(); @@ -558,13 +579,21 @@ export default { if (!response.errors) { window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`)); } - } else { - editFormTitle.value = `${t(item.path)}${querySchema.value?.title}`; + } else if (item.meta.isTop) { + exportModel.value = defaultExportModel; + versions.value = ( + await request("settleaccount/centralized-control/get-all", null, { method: "POST" }) + ).data.items.map((o) => ({ + value: o.version, + label: o.version, + })); + editFormTitle.value = `${t(item.path)}${config.query.schema.title}`; dialogVisible.value = true; } } else if (item.path === "import") { //import try { + importModel.value = Object.assign({}, defaultImportModel); editFormloading.value = true; editFormTitle.value = `${t(item.path)}${config.query.schema.title}`; fileList.value = []; @@ -624,20 +653,22 @@ export default { dialogVisible.value = false; editFormMode.value = null; } else if (editFormMode.value === "export") { - const postData = JSON.parse(JSON.stringify(queryModel.value)); - postData.filters = filterList.value.filter((o) => o.property && o.value); - delete postData.query["items"]; - delete postData.query["id"]; - const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`; - const response = await post(url, postData); - download(response); + // const postData = JSON.parse(JSON.stringify(queryModel.value)); + // postData.filters = filterList.value.filter((o) => o.property && o.value); + // delete postData.query["items"]; + // delete postData.query["id"]; + // const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`; + // const response = await post(url, postData); + // download(response); + const url = config.edit.exportUrl; + await request(url, exportModel.value, { method: config.edit.exportMethod }); dialogVisible.value = false; } else if (editFormMode.value === "import") { editFormloading.value = true; const url = config.edit.importUrl; const formData = new FormData(); - formData.append("version", importModel.version); - formData.append("factory", importModel.factory); + formData.append("version", importModel.value.version); + formData.append("factory", importModel.value.factory); for (let i = 0; i < fileList.value.length; i++) { formData.append(`files`, fileList.value[i].raw); } @@ -788,18 +819,6 @@ export default { queryModel.value = schemaToModel(config.query.schema); getSortModel(queryModel.value); filterList.value = queryModel.value?.filters ?? []; - //pushfilterList(); - // if (!querySchema.value) { - // const vm = (await get(indexUrl)).data; - // querySchema.value = vm.schema.properties.query; - // tableSchema.value = vm.schema.properties.items.items; - // data.value = vm.model ?? schemaToModel(vm.schema); - // if (props.query) { - // Object.assign(data.value.query, props.query); - // } - // getSortModel(data.value); - // getColumns(vm.schema.properties.query); - // } getColumns(config.table.schema); if (props.query) { Object.assign(queryModel.value.query, props.query); diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js index ab5483cf..d11dfac4 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js @@ -1,6 +1,8 @@ import html from "html"; import { defineAsyncComponent, reactive, watch } from "vue"; import { useRouter } from "vue-router"; +import { useAppStore } from "../store/index.js"; +import { ElMessageBox } from "element-plus"; export default { name: "menuItem", @@ -33,6 +35,7 @@ export default { }, }, setup(props, context) { + const appStore = useAppStore(); const router = useRouter(); const model = reactive(props.modelValue); watch( @@ -45,6 +48,11 @@ export default { // const click = (route) => { if (!route.meta.isExternal) { + // if (appStore.routes.length >= 10) { + // ElMessageBox.alert(`已经页签数量`, `提示`); + // } else { + // router.push(route.meta.path); + // } router.push(route.meta.path); } else { window.open(route.path); From 6ae9b0a531c211961b26d76dfa3bd67573bc6a1b 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: Thu, 20 Jul 2023 13:47:30 +0800 Subject: [PATCH 07/12] update --- .../wwwroot/models/cost/cost.js | 132 ++++++++++++++++++ .../wwwroot/models/inventory/backup.js | 132 ++++++++++++++++++ .../wwwroot/models/inventory/balance.js | 132 ++++++++++++++++++ .../wwwroot/models/inventory/record.js | 132 ++++++++++++++++++ .../models/invoice/invoice_map_group.js | 132 ++++++++++++++++++ .../models/invoice/invoice_not_settle.js | 132 ++++++++++++++++++ .../wwwroot/models/invoice/invoice_service.js | 45 ++++-- .../models/invoice/invoice_wait_detail.js | 132 ++++++++++++++++++ .../wwwroot/router/business.js | 2 +- .../wwwroot/views/cost/cost.js | 15 ++ .../wwwroot/views/inventory/backup.js | 15 ++ .../wwwroot/views/inventory/balance.js | 15 ++ .../wwwroot/views/inventory/record.js | 15 ++ .../views/invoice/invoice_map_group.js | 15 ++ .../views/invoice/invoice_not_settle.js | 15 ++ .../views/invoice/invoice_wait_detail.js | 15 ++ 16 files changed, 1060 insertions(+), 16 deletions(-) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/cost/cost.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/record.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/cost/cost.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/backup.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/balance.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/record.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_not_settle.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_wait_detail.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/cost/cost.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/cost/cost.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/cost/cost.js @@ -0,0 +1,132 @@ +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/inventory/backup.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js @@ -0,0 +1,132 @@ +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/inventory/balance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js @@ -0,0 +1,132 @@ +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/inventory/record.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/record.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/record.js @@ -0,0 +1,132 @@ +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/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js @@ -0,0 +1,132 @@ +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/invoice/invoice_not_settle.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js @@ -0,0 +1,132 @@ +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/invoice/invoice_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js index 2a0fb11a..b02e3578 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js @@ -1,16 +1,18 @@ -import version from "../../version.js"; -import { state2, state3 } from "../../state.js"; - +import version from "../version.js"; +import { state2, state3 } from "../state.js"; const schema = { - title: "财务管理审核", + title: "财务审核", type: "object", properties: { version, - state2, realnvBillNum: { title: "实际纸质发票号", type: "string", }, + invbillNum: { + title: "系统生成发票号", + type: "string", + }, amt: { title: "未税金额", type: "decimal", @@ -19,10 +21,6 @@ const schema = { title: "税后金额", type: "decimal", }, - invGroupNum: { - title: "发票分组号", - type: "string", - }, fileName: { title: "开票Excel文件", type: "string", @@ -31,14 +29,23 @@ const schema = { title: "业务类别", type: "EnumBusinessType", }, + state2, }, }; const baseUrl = "settleaccount/invoice_service"; -const queryUrl = `${baseUrl}/main-query`; -const importUrl = `${baseUrl}/invoice_service-upload-excel-import`; +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 exportUrl = `${baseUrl}/export`; const queryMethod = "POST"; -const importMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const exportMethod = "POST"; export default function () { return { @@ -47,7 +54,7 @@ export default function () { method: queryMethod, hasFilter: true, schema: { - title: "财务管理审核", + title: "财务审核", type: "object", properties: { filters: { @@ -99,8 +106,16 @@ export default function () { schema: schema, }, edit: { - importUrl, - importMethod, + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + exportMethod, schema: schema, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js @@ -0,0 +1,132 @@ +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/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 23a19515..4c745ac8 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 @@ -2383,7 +2383,7 @@ export default [ path: "invoice_service", meta: { type: "page", - title: "财务管理审核", + title: "财务审核", icon: "file", }, children: [ diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/cost/cost.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/cost/cost.js new file mode 100644 index 00000000..9836151e --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/cost/cost.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/cost/cost.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/backup.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/backup.js new file mode 100644 index 00000000..6ed2e8f3 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/backup.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/inventory/backup.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/balance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/balance.js new file mode 100644 index 00000000..50e8961b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/balance.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/inventory/balance.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/record.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/record.js new file mode 100644 index 00000000..bb4fd659 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/record.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/inventory/record.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js new file mode 100644 index 00000000..54e9f61f --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/invoice/invoice_map_group.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/invoice/invoice_not_settle.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_not_settle.js new file mode 100644 index 00000000..d90d10c4 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_not_settle.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/invoice/invoice_not_settle.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + 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/invoice/invoice_wait_detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_wait_detail.js new file mode 100644 index 00000000..436bf656 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_wait_detail.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/invoice/invoice_wait_detail.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; From a225f00465ff8d9e37e1bcebe1a8e81695a396ea Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 20 Jul 2023 13:52:05 +0800 Subject: [PATCH 08/12] update --- .../wwwroot/components/list/index.js | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 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 59c3c20a..0ca4da42 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 @@ -233,16 +233,18 @@ export default { - - - - - - - - - - - - + @@ -807,6 +809,13 @@ export default { } return postData; } + function isNotJit() { + return ( + route.meta.enumBusinessType !== "ZhiGongJian" || + route.meta.enumBusinessType !== "BeiJian" || + route.meta.enumBusinessType !== "YingDuJian" + ); + } onMounted(async () => { if (route.meta.children?.length) { for (const item of route.meta.children) { @@ -876,6 +885,7 @@ export default { versions, pushfilterList, getOperators, + isNotJit, }; }, }; From e601ab2c2badf6705614b3fc0e946f5b0ef236bf Mon Sep 17 00:00:00 2001 From: mahao Date: Thu, 20 Jul 2023 13:55:39 +0800 Subject: [PATCH 09/12] =?UTF-8?q?Jis=E7=BB=93=E7=AE=97=E4=B8=8E=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=AF=B9=E6=AF=94=E8=AF=B7=E6=B1=82Dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BQ/Dtos/JisSaSeCompareRequestDto.cs | 53 +++++++++++++++++++ .../Entities/BQ/BBAC_SA_DETAIL_SERVICE.cs | 47 ---------------- 2 files changed, 53 insertions(+), 47 deletions(-) create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/JisSaSeCompareRequestDto.cs diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/JisSaSeCompareRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/JisSaSeCompareRequestDto.cs new file mode 100644 index 00000000..912a9be8 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/JisSaSeCompareRequestDto.cs @@ -0,0 +1,53 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace Win.Sfs.SettleAccount.Entities.BQ; + +/// +/// Jis结算与发运对比请求Dto +/// +public class JisSaSeCompareRequestDto +{ + /// + /// 期间 + /// + [Display(Name = "期间")] + [Required(ErrorMessage = "{0}不能为空")] + public string Version { get; set; } + + /// + /// 发运开始时间 + /// + [Display(Name = "发运开始时间")] + public DateTime SeStartDateTime { get; set; } + + /// + /// 发运结束时间 + /// + [Display(Name = "发运结束时间")] + public DateTime SeEndDateTime { get; set; } + + /// + /// 下线开始时间 + /// + [Display(Name = "下线开始时间")] + public DateTime DownLineStartDateTime { get; set; } + + /// + /// 下线结束时间 + /// + [Display(Name = "下线结束时间")] + public DateTime DownLineEndDateTime { get; set; } + + /// + /// 零件号 + /// + [Display(Name = "零件号")] + public string LU { get; set; } + + /// + /// 通用码 + /// + [Display(Name = "通用码")] + public string PN { get; set; } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_DETAIL_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_DETAIL_SERVICE.cs index d3f0ff75..a293d9ca 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_DETAIL_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_DETAIL_SERVICE.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -25,49 +24,3 @@ public class BBAC_SA_DETAIL_SERVICE } #endregion } - -public class JisSaSeCompareRequestDto -{ - /// - /// 期间 - /// - [Display(Name = "期间")] - [Required(ErrorMessage = "{0}不能为空")] - public string Version { get; set; } - - /// - /// 发运开始时间 - /// - [Display(Name = "发运开始时间")] - public DateTime SeStartDateTime { get; set; } - - /// - /// 发运结束时间 - /// - [Display(Name = "发运结束时间")] - public DateTime SeEndDateTime { get; set; } - - /// - /// 下线开始时间 - /// - [Display(Name = "下线开始时间")] - public DateTime DownLineStartDateTime { get; set; } - - /// - /// 下线结束时间 - /// - [Display(Name = "下线结束时间")] - public DateTime DownLineEndDateTime { get; set; } - - /// - /// 零件号 - /// - [Display(Name = "零件号")] - public string LU { get; set; } - - /// - /// 通用码 - /// - [Display(Name = "通用码")] - public string PN { get; set; } -} From 51ae23d2a4679d7bfd2fc6d46d6a3e748ed623af 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: Thu, 20 Jul 2023 15:03:05 +0800 Subject: [PATCH 10/12] update --- .../wwwroot/api/site.js | 1 + .../wwwroot/components/list/index.js | 44 +++++++++---------- .../contrast/bbac_sa_detail_jobservice.js | 22 +++++++--- .../wwwroot/router/business.js | 39 ++++++++++------ 4 files changed, 64 insertions(+), 42 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js index 3543762a..21c2cac5 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js @@ -91,6 +91,7 @@ async function getLocalizationAsync() { remove: "移除", restore: "还原", delete: "删除", + compare: "对比", authenticate: "验证", loginModel: "登录", login: "登录", 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 0ca4da42..28e6fb4d 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 @@ -226,7 +226,7 @@ export default { style="height:100%;" /> -