From 1dfc3ca7fb6a40c914d830a13e1a648285bcda90 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 24 Apr 2026 13:40:57 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-24=20CommGroup3=20=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/partInformation.vue | 27 ++++++++++++++++++- .../projectInfo/com_project_info_part.vue | 7 +++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index cbd37ec..ab0a195 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -259,7 +259,7 @@ 商品组3 / Comm Group 3 - + @@ -1755,6 +1755,7 @@ showInQueryFlag: '', temporaryPartFlag: '', mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -3451,6 +3452,7 @@ uploadDialog: false, saveItemModelFlag: false, mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -3534,6 +3536,7 @@ // 重置标识 resetFlags () { this.mainInfoFlag = false + this.commGroup3InfoFlag = false this.costsInfoFlag = false this.manufacturingInfoFlag = false this.planningInfoFlag = false @@ -3551,6 +3554,7 @@ 'countryOfOrigin', 'expectedLeadTime', 'durabilityDay', 'regionOfOrigin', 'intrastatConvFactor', 'customsStatNo', 'remark', 'inventoryValuationMethod', 'partCostGroupId', 'inventoryPartCostLevel', 'invoiceConsideration', 'zeroCostFlag', 'codeNo', 'supplyCode', 'commGroup3'], + commGroup3InfoFlag: ['commGroup3'], costsInfoFlag: ['estimatedMaterialCost'], manufacturingInfoFlag: ['cumLeadTime', 'backFlushPart', 'byProdAsSupplyInMrpDb', 'unprotectedLeadTime', 'issueType', 'mrpControlFlagDb', 'fixedLeadTimeDay', 'overReporting', 'useTheoreticalDensityDb', @@ -4181,6 +4185,7 @@ showInQueryFlag: 'Y', temporaryPartFlag: 'Y', mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -4308,6 +4313,7 @@ showInQueryFlag: row.showInQueryFlag, temporaryPartFlag: row.temporaryPartFlag, mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -4433,6 +4439,7 @@ showInQueryFlag: row.showInQueryFlag, temporaryPartFlag: row.temporaryPartFlag, mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -4557,6 +4564,7 @@ showInQueryFlag: row.showInQueryFlag, temporaryPartFlag: row.temporaryPartFlag, mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -5058,6 +5066,11 @@ this.$message.warning('商品组1为"00100"时，商品组3必填！') return } + // 如果商品组1不是"00100"，清空商品组3 + if (this.modalData.productGroupId1 !== '00100') { + this.modalData.commGroup3 = '' + this.modalData.commGroup3Desc = '' + } if (this.modalData.umId === '' || this.modalData.umId == null) { this.$message.warning('请选择计量单位！') return @@ -5214,6 +5227,7 @@ }) } else { this.modalData.mainInfoFlag = this.mainInfoFlag + this.modalData.commGroup3InfoFlag = this.commGroup3InfoFlag this.modalData.costsInfoFlag = this.costsInfoFlag this.modalData.manufacturingInfoFlag = this.manufacturingInfoFlag this.modalData.planningInfoFlag = this.planningInfoFlag @@ -5562,6 +5576,10 @@ // 商品组1输入校验 productGroupId1Blur (tagNo) { + if (this.modalData.productGroupId1 !== '00100') { + this.modalData.commGroup3 = '' + this.modalData.commGroup3Desc = '' + } let tempData = { tagno: tagNo, conditionSql: " and product_group_id = '" + this.modalData.productGroupId1 + "'" + " and site = '" + this.modalData.site + "'" @@ -5987,6 +6005,9 @@ // ======== chooseList相关方法 ======== // 获取基础数据列表S getBaseList (val, type) { + if (val === 130 && this.modalData.productGroupId1 !== '00100') { + return + } this.tagNo = val this.tempCodeNo = this.modalData.codeNo this.$nextTick(() => { @@ -6050,6 +6071,10 @@ } else if (this.tagNo === 110) { this.modalData.productGroupId1 = val.product_group_id this.modalData.productGroupName1 = val.product_group_name + if (this.modalData.productGroupId1 !== '00100') { + this.modalData.commGroup3 = '' + this.modalData.commGroup3Desc = '' + } } else if (this.tagNo === 111) { this.modalData.productGroupId2 = val.product_group_id this.modalData.productGroupName2 = val.product_group_name diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index 8c87b06..0a33c20 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -1902,6 +1902,7 @@ import CodeGeneration from "../../code/generation.vue"; watchers: [], unwatchTable: null, // 用于保存监听器的取消函数 mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -1918,6 +1919,7 @@ import CodeGeneration from "../../code/generation.vue"; // 重置标识 resetFlags () { this.mainInfoFlag = false + this.commGroup3InfoFlag = false this.costsInfoFlag = false this.manufacturingInfoFlag = false this.planningInfoFlag = false @@ -1935,6 +1937,7 @@ import CodeGeneration from "../../code/generation.vue"; 'countryOfOrigin', 'expectedLeadTime', 'durabilityDay', 'regionOfOrigin', 'intrastatConvFactor', 'customsStatNo', 'remark', 'inventoryValuationMethod', 'partCostGroupId', 'inventoryPartCostLevel', 'invoiceConsideration', 'zeroCostFlag', 'codeNo', 'supplyCode', 'commGroup3'], + commGroup3InfoFlag: ['commGroup3'], costsInfoFlag: ['estimatedMaterialCost'], manufacturingInfoFlag: ['cumLeadTime', 'backFlushPart', 'byProdAsSupplyInMrpDb', 'unprotectedLeadTime', 'issueType', 'mrpControlFlagDb', 'fixedLeadTimeDay', 'overReporting', 'useTheoreticalDensityDb', @@ -2306,6 +2309,7 @@ import CodeGeneration from "../../code/generation.vue"; showInQueryFlag: 'Y', temporaryPartFlag: 'Y', mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -2437,6 +2441,7 @@ import CodeGeneration from "../../code/generation.vue"; showInQueryFlag: data.rows.showInQueryFlag, temporaryPartFlag: data.rows.temporaryPartFlag, mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -2569,6 +2574,7 @@ import CodeGeneration from "../../code/generation.vue"; showInQueryFlag: 'Y', temporaryPartFlag: 'Y', mainInfoFlag: false, // 主信息标识 + commGroup3InfoFlag: false, // commGroup3标识 costsInfoFlag: false, // costs标识 manufacturingInfoFlag: false, // Manufacturing标识 planningInfoFlag: false, // planning标识 @@ -2735,6 +2741,7 @@ import CodeGeneration from "../../code/generation.vue"; }) } else { this.modalData.mainInfoFlag = this.mainInfoFlag + this.modalData.commGroup3InfoFlag = this.commGroup3InfoFlag this.modalData.costsInfoFlag = this.costsInfoFlag this.modalData.manufacturingInfoFlag = this.manufacturingInfoFlag this.modalData.planningInfoFlag = this.planningInfoFlag