From 69f8da31cdbec62a27cd21c3814db63a5ea466cd Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 13 Sep 2023 09:04:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/components/table/index.js | 2 +- .../wwwroot/models/input/jie-suan.js | 8 ++++---- .../wwwroot/views/settle/_check.js | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js index 600f5437..6b5e29aa 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js @@ -39,7 +39,7 @@ export default {
- +
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js index 9d6bd941..ed1229f6 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js @@ -1,12 +1,12 @@ import businessType, { version, state } from "../_options.js"; -export default function (businessType, meta) { +export default function (type, meta) { let service = null; let detailService = null; - if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") { + if (type === "JisBBAC" || type === "MaiDanJianBBAC") { service = "bbac_sa_service"; detailService = "bbac_sa_detail_service"; - } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") { + } else if (type === "JisHBPO" || type === "MaiDanJianHBPO") { service = "hbpo_sa_service"; detailService = "hbpo_sa_detail_service"; } else { @@ -100,7 +100,7 @@ export default function (businessType, meta) { { label: 1046, value: 1046 }, ], input: "select", - hidden: true, + hideForList: true, default: meta.client === "bbac-1040" ? 1040 : 1046, }; querySchema.properties.filters.default.push({ diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js index 8b509301..c5ad76ec 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js @@ -63,8 +63,8 @@ export default { -
-
+
+
新建 @@ -80,7 +80,7 @@ export default {
-
+
@@ -94,7 +94,7 @@ export default {
-
+
@@ -117,7 +117,7 @@ export default {
-
+
@@ -488,7 +488,7 @@ export default { }, }; const defaultAdjModel = schemaToModel(adjSchema); - const adjModel = ref(Object.assign({ invBillNum: "" }, defaultAdjModel)); + const adjModel = ref(null); const addAdjFormRef = ref(null); const showAddAdjDialog = () => { adjModel.value = Object.assign({}, defaultAdjModel); @@ -498,7 +498,7 @@ export default { try { const valid = await addAdjFormRef.value.validate(); if (valid) { - adjList.value.unshift(adjModel.value); + adjList.value.unshift(Object.assign({}, adjModel.value)); addDialogVisible.value = false; nextTick(() => { scrollRef.value.update(); From 4ace231c28845a07b90598a6eac52236ffc32671 Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 13 Sep 2023 09:13:34 +0800 Subject: [PATCH 2/7] up --- .../src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs | 2 +- .../Entities/Prices/PriceListAppServiceBJ.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs index 173fe31a..dca03b9b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs @@ -447,7 +447,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase { EnumBusinessType.ZhiGongJianBBAC => site, EnumBusinessType.ZhiGongJianHBPO => "104T", - EnumBusinessType.BeiJian => "1040", + EnumBusinessType.BeiJian => "1049", EnumBusinessType.YinDuJian => "1040", _ => throw new UserFriendlyException($"业务编码错误", "400") }; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index aed28b00..33aa303a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -58,7 +58,7 @@ public class PriceListAppServiceBJ : SettleAccountApplicationBase var result = await _exportImporter.UploadExcelImportByHeadDesc(files, _excelImportService).ConfigureAwait(false); var filter = new List { - "1040" + "1049" }; result = result.Where(p => filter.Contains(p.Plant)).ToList(); result.FindAll(t => !string.IsNullOrEmpty(t.ES1) || !string.IsNullOrEmpty(t.ES2)).ForEach(t => t.PartNo = t.PartNo + new string(' ', 6) + t.ES1 + t.ES2); From d5eb8edfab710761a1fdda65bac14374291f28ce Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 13 Sep 2023 09:46:12 +0800 Subject: [PATCH 3/7] update --- .../SettleAccount.HttpApi.Host/wwwroot/components/list/index.js | 2 +- 1 file changed, 1 insertion(+), 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 429b8ac9..2cc27aec 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 @@ -90,7 +90,7 @@ export default { -