diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index dcc2efa..cf3f503 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -182,7 +182,7 @@
Next Part No
-
+
@@ -246,6 +246,13 @@
+
+
+ 商品组3 / Comm Group 3
+
+
+
+
资产等级 / Asset Class
@@ -329,6 +336,14 @@
+
+
+
+
+
+
+
+
@@ -1485,6 +1500,7 @@
this.modalData.productGroupId4 = this.modalData.productGroupId4.toUpperCase()
this.modalData.hazardCode = this.modalData.hazardCode.toUpperCase()
this.modalData.productGroupId3 = this.modalData.productGroupId3.toUpperCase()
+ this.modalData.commGroup3 = this.modalData.commGroup3.toUpperCase()
this.modalData.groupId = this.modalData.groupId.toUpperCase()
this.modalData.productGroupId1 = this.modalData.productGroupId1.toUpperCase()
this.modalData.familyId = this.modalData.familyId.toUpperCase()
@@ -1612,6 +1628,8 @@
productGroupName3: '',
productGroupId4: '',
productGroupName4: '',
+ commGroup3: '',
+ commGroup3Desc: '',
erpPartNo: '',
codeNo: '',
codeDesc: '',
@@ -1644,6 +1662,7 @@
customsStatDesc: '',
durabilityDay: '',
intrastatConvFactor: undefined,
+ supplyCode: '',
umDesc: '',
status: '',
partStatus: '',
@@ -2085,6 +2104,22 @@
fixed: '',
columnWidth: 100
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 104001,
+ serialNumber: '104001Table1CommGroup3',
+ tableId: '104001Table1',
+ tableName: '物料信息表',
+ columnProp: 'commGroup3Desc',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '商品组3',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
{
userId: this.$store.state.user.name,
functionId: 104001,
@@ -3912,6 +3947,8 @@
productGroupName3: '',
productGroupId4: '*',
productGroupName4: 'NorthSky Application owner',
+ commGroup3: '',
+ commGroup3Desc: '',
erpPartNo: '',
codeNo: '',
codeDesc: '',
@@ -3941,6 +3978,7 @@
customsStatDesc: '',
durabilityDay: '',
intrastatConvFactor: undefined,
+ supplyCode: '',
umDesc: '',
status: 'N',
partStatus: 'A',
@@ -4034,6 +4072,8 @@
productGroupName3: row.productGroupName3,
productGroupId4: row.productGroupId4,
productGroupName4: row.productGroupName4,
+ commGroup3: row.commGroup3,
+ commGroup3Desc: row.commGroup3Desc,
erpPartNo: row.erpPartNo,
codeNo: row.codeNo,
codeDesc: row.codeDesc,
@@ -4063,6 +4103,7 @@
customsStatDesc: row.customsStatDesc,
durabilityDay: row.durabilityDay,
intrastatConvFactor: row.intrastatConvFactor,
+ supplyCode: row.supplyCode,
umDesc: row.umDesc,
status: row.status,
partStatus: row.partStatus,
@@ -4155,6 +4196,8 @@
productGroupName3: row.productGroupName3,
productGroupId4: row.productGroupId4,
productGroupName4: row.productGroupName4,
+ commGroup3: row.commGroup3,
+ commGroup3Desc: row.commGroup3Desc,
erpPartNo: row.erpPartNo,
codeNo: row.codeNo,
codeDesc: row.codeDesc,
@@ -4184,6 +4227,7 @@
customsStatDesc: row.customsStatDesc,
durabilityDay: row.durabilityDay,
intrastatConvFactor: row.intrastatConvFactor,
+ supplyCode: row.supplyCode,
umDesc: row.umDesc,
status: row.status,
partStatus: row.partStatus,
@@ -4273,6 +4317,8 @@
productGroupName3: row.productGroupName3,
productGroupId4: row.productGroupId4,
productGroupName4: row.productGroupName4,
+ commGroup3: row.commGroup3,
+ commGroup3Desc: row.commGroup3Desc,
erpPartNo: row.erpPartNo,
codeNo: row.codeNo,
codeDesc: row.codeDesc,
@@ -4302,6 +4348,7 @@
customsStatDesc: row.customsStatDesc,
durabilityDay: row.durabilityDay,
intrastatConvFactor: row.intrastatConvFactor,
+ supplyCode: row.supplyCode,
umDesc: row.umDesc,
status: row.status,
partStatus: row.partStatus,
@@ -4816,6 +4863,11 @@
this.$message.warning('请选择计划人!')
return
}
+ // 如果商品组1是"00100",则商品组3必填
+ if (this.modalData.productGroupId1 === '00100' && (this.modalData.commGroup3 === '' || this.modalData.commGroup3 == null)) {
+ this.$message.warning('商品组1为"00100"时,商品组3必填!')
+ return
+ }
if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning('请选择计量单位!')
return
@@ -5343,6 +5395,24 @@
})
},
+ // 商品组3输入校验
+ commGroup3Blur (tagNo) {
+ let tempData = {
+ tagno: tagNo,
+ conditionSql: " and product_group_id = '" + this.modalData.commGroup3 + "'" + " and site = '" + this.modalData.site + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.modalData.commGroup3 = data.baseListData[0].product_group_id
+ this.modalData.commGroup3Desc = data.baseListData[0].product_group_name
+ } else {
+ this.modalData.commGroup3Desc = ''
+ }
+ }
+ })
+ },
+
// 资产等级输入校验
assetClassBlur (tagNo) {
let tempData = {
@@ -5734,6 +5804,8 @@
strVal = this.modalData.regionOfOrigin
} else if (val === 129) {
strVal = this.modalData.customsStatNo
+ } else if (val === 130) {
+ strVal = this.modalData.commGroup3
} else if (val === 131) {
strVal = this.modalData.partCostGroupId
} else if (val === 132) {
@@ -5768,6 +5840,9 @@
} else if (this.tagNo === 113) {
this.modalData.productGroupId4 = val.product_group_id
this.modalData.productGroupName4 = val.product_group_name
+ } else if (this.tagNo === 130) {
+ this.modalData.commGroup3 = val.product_group_id
+ this.modalData.commGroup3Desc = val.product_group_name
} else if (this.tagNo === 114) {
this.modalData.manufacturerId = val.manufacturer_id
this.modalData.manufacturerName = val.manufacturer_name
diff --git a/src/views/modules/part/productGroupInformation.vue b/src/views/modules/part/productGroupInformation.vue
index 001fc43..1473769 100644
--- a/src/views/modules/part/productGroupInformation.vue
+++ b/src/views/modules/part/productGroupInformation.vue
@@ -19,6 +19,7 @@
+
@@ -102,6 +103,7 @@
+
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 9cef193..70ad823 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -91,7 +91,7 @@
BU
-
+
@@ -155,6 +155,13 @@
+
+
+ 商品组3 / Comm Group 3
+
+
+
+
资产等级 / Asset Class
@@ -238,6 +245,14 @@
+
+
+
+
+
+
+
+
@@ -988,6 +1003,7 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
this.modalData.productGroupId4 = this.modalData.productGroupId4.toUpperCase()
this.modalData.hazardCode = this.modalData.hazardCode.toUpperCase()
this.modalData.productGroupId3 = this.modalData.productGroupId3.toUpperCase()
+ this.modalData.commGroup3 = this.modalData.commGroup3 ? this.modalData.commGroup3.toUpperCase() : ''
// this.modalData.umId = this.modalData.umId.toUpperCase()
this.modalData.groupId = this.modalData.groupId.toUpperCase()
this.modalData.productGroupId1 = this.modalData.productGroupId1.toUpperCase()
@@ -1413,6 +1429,8 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
productGroupName3: '',
productGroupId4: '',
productGroupName4: '',
+ commGroup3: '',
+ commGroup3Desc: '',
erpPartNo: '',
codeNo: '',
codeDesc: '',
@@ -1445,6 +1463,7 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
customsStatDesc: '',
durabilityDay: '',
intrastatConvFactor: '',
+ supplyCode: '',
umDesc: '',
status: '',
partStatus: '',
@@ -1945,6 +1964,8 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
strVal = this.modalData.productGroupId3
} else if (val === 113) {
strVal = this.modalData.productGroupId4
+ } else if (val === 130) {
+ strVal = this.modalData.commGroup3
} else if (val === 114) {
strVal = this.modalData.manufacturerId
} else if (val === 20) {
@@ -1998,6 +2019,9 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
} else if (this.tagNo === 113) {
this.modalData.productGroupId4 = val.product_group_id
this.modalData.productGroupName4 = val.product_group_name
+ } else if (this.tagNo === 130) {
+ this.modalData.commGroup3 = val.product_group_id
+ this.modalData.commGroup3Desc = val.product_group_name
} else if (this.tagNo === 114) {
this.modalData.manufacturerId = val.manufacturer_id
this.modalData.manufacturerName = val.manufacturer_name
@@ -2115,6 +2139,8 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
productGroupName3: '',
productGroupId4: '*',
productGroupName4: 'NorthSky Application owner',
+ commGroup3: '',
+ commGroup3Desc: '',
erpPartNo: '',
codeNo: '',
codeDesc: '',
@@ -2144,6 +2170,7 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
customsStatDesc: '',
durabilityDay: '',
intrastatConvFactor: '',
+ supplyCode: '',
umDesc: '',
status: 'N',
partStatus: 'A',
@@ -2244,6 +2271,8 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
productGroupName3: data.rows.productGroupName3,
productGroupId4: data.rows.productGroupId4,
productGroupName4: data.rows.productGroupName4,
+ commGroup3: data.rows.commGroup3,
+ commGroup3Desc: data.rows.commGroup3Desc,
erpPartNo: data.rows.erpPartNo,
codeNo: data.rows.codeNo,
codeDesc: data.rows.codeDesc,
@@ -2273,6 +2302,7 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
customsStatDesc: data.rows.customsStatDesc,
durabilityDay: data.rows.durabilityDay,
intrastatConvFactor: data.rows.intrastatConvFactor,
+ supplyCode: data.rows.supplyCode,
umDesc: data.rows.umDesc,
status: data.rows.status,
partStatus: data.rows.partStatus,
@@ -2402,6 +2432,7 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
customsStatDesc: data.rows.customsStatDesc,
durabilityDay: data.rows.durabilityDay,
intrastatConvFactor: data.rows.intrastatConvFactor,
+ supplyCode: data.rows.supplyCode,
umDesc: data.rows.umDesc,
status: data.rows.status,
partStatus: data.rows.partStatus,
@@ -2529,6 +2560,11 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
this.$message.warning('请选择计划人!')
return
}
+ // 如果商品组1是"00100",则商品组3必填
+ if (this.modalData.productGroupId1 === '00100' && (this.modalData.commGroup3 === '' || this.modalData.commGroup3 == null)) {
+ this.$message.warning('商品组1为"00100"时,商品组3必填!')
+ return
+ }
if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning('请选择计量单位!')
return
@@ -3365,6 +3401,24 @@ import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/
})
},
+ // 商品组3输入校验
+ commGroup3Blur (tagNo) {
+ let tempData = {
+ tagno: tagNo,
+ conditionSql: " and product_group_id = '" + this.modalData.commGroup3 + "'" + " and site = '" + this.modalData.site + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.modalData.commGroup3 = data.baseListData[0].product_group_id
+ this.modalData.commGroup3Desc = data.baseListData[0].product_group_name
+ } else {
+ this.modalData.commGroup3Desc = ''
+ }
+ }
+ })
+ },
+
// 资产等级输入校验
assetClassBlur (tagNo) {
let tempData = {