diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 82e9518..9a8d779 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -1421,14 +1421,6 @@
this.$message.warning('到达时间不能大于实际执行时间！')
return
}
- if (this.detailData.faultReason === '' || this.detailData.faultReason == null || this.detailData.faultReason.length < 10) {
- this.$message.warning('请填写故障原因，且不低于十个字数！')
- return
- }
- if (this.detailData.handlingMethod === '' || this.detailData.handlingMethod == null || this.detailData.handlingMethod.length < 10) {
- this.$message.warning('请填写处理方式，且不低于十个字数！')
- return
- }
updateReportResult(this.detailData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 2879716..187204f 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -1545,7 +1545,7 @@ export default {
columnWidth: 300
},
{
- columnProp: 'printUnit',
+ columnProp: 'printUnitName',
headerAlign: "center",
align: "center",
columnLabel: '计量单位',
@@ -1556,7 +1556,7 @@ export default {
columnWidth: 100
},
{
- columnProp: 'partType',
+ columnProp: 'partType2',
headerAlign: "center",
align: "center",
columnLabel: '零件类型',
@@ -1564,7 +1564,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
}
],
componentPartColumnList: [
@@ -1602,7 +1602,7 @@ export default {
columnWidth: 300
},
{
- columnProp: 'printUnit',
+ columnProp: 'printUnitName',
headerAlign: "center",
align: "center",
columnLabel: '计量单位',
@@ -1613,7 +1613,7 @@ export default {
columnWidth: 100
},
{
- columnProp: 'partType',
+ columnProp: 'partType2',
headerAlign: "center",
align: "center",
columnLabel: '零件类型',
@@ -1621,7 +1621,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
}
],
columnSubDetailList1: [
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 6d5aeb1..64e258c 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -145,8 +145,6 @@
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buNo">
-
-
@@ -156,12 +154,11 @@
-
-
-
-
-
-
+
+
+
+
+
@@ -171,39 +168,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
计量单位
-
+
@@ -213,29 +182,24 @@
-
-
-
-
-
商品组1
-
-
+
+
商品组2
-
-
+
+
商品组3
-
-
+
+
属性模板
@@ -243,28 +207,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1146,36 +1088,21 @@
bu: '',
partNo: '',
partDesc: '',
- umId: '',
+ umId2: '',
umName: '',
spec: '',
active: '',
- cinvSourceCode: '',
- sku: '',
- qtyBoxRoll: '',
- qtyRoll: '',
- partType: '',
+ partType2: '',
standardBoxQty: '',
- controlMes: '',
- cinvcname: '',
- otherGroup1: '',
- otherGroupName1: '',
- otherGroup2: '',
- otherGroupName2: '',
- otherGroup3: '',
- otherGroupName3: '',
- defaultWarehouseID: '',
- defaultWarehouseName: '',
+ productGroupId1: '',
+ productGroupName1: '',
+ productGroupId2: '',
+ productGroupName2: '',
+ productGroupId3: '',
+ productGroupName3: '',
familyID: '',
familyName: '',
- invdefinetype: '',
partDesceEn: '',
- moldCode: '',
- moldCodeRequired: '',
- serialNumberRequired: '',
- partMesType: '',
- productRev: '',
- invtype: '',
remark: '',
codeNo: '',
codeDesc: ''
@@ -1275,7 +1202,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 80
},
{
userId: this.$store.state.user.name,
@@ -1365,15 +1292,15 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 601001,
- serialNumber: '601001Table1PartType',
+ serialNumber: '601001Table1PartType2Desc',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'partType',
+ columnProp: 'partType2Desc',
headerAlign: 'center',
align: 'center',
columnLabel: '零件类型',
@@ -1383,7 +1310,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1391,7 +1318,7 @@
serialNumber: '601001Table1UmId',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'umId',
+ columnProp: 'umId2',
headerAlign: 'center',
align: 'center',
columnLabel: '计量单位编码',
@@ -1401,7 +1328,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1419,7 +1346,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -1437,7 +1364,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1455,7 +1382,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -1463,7 +1390,7 @@
serialNumber: '601001Table1OtherGroup1',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroup1',
+ columnProp: 'productGroupId1',
headerAlign: 'center',
align: 'center',
columnLabel: '商品组1编码',
@@ -1473,7 +1400,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1481,7 +1408,7 @@
serialNumber: '601001Table1OtherGroupName1',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroupName1',
+ columnProp: 'productGroupName1',
headerAlign: 'center',
align: 'left',
columnLabel: '商品组1名称',
@@ -1491,7 +1418,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -1499,7 +1426,7 @@
serialNumber: '601001Table1OtherGroup2',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroup2',
+ columnProp: 'productGroupId2',
headerAlign: 'center',
align: 'center',
columnLabel: '商品组2编码',
@@ -1509,7 +1436,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1517,7 +1444,7 @@
serialNumber: '601001Table1OtherGroupName2',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroupName2',
+ columnProp: 'productGroupName2',
headerAlign: 'center',
align: 'left',
columnLabel: '商品组2名称',
@@ -1527,7 +1454,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -1535,7 +1462,7 @@
serialNumber: '601001Table1OtherGroup3',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroup3',
+ columnProp: 'productGroupId3',
headerAlign: 'center',
align: 'center',
columnLabel: '商品组3编码',
@@ -1545,7 +1472,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
@@ -1553,7 +1480,7 @@
serialNumber: '601001Table1OtherGroupName3',
tableId: '601001Table1',
tableName: '物料信息表',
- columnProp: 'otherGroupName3',
+ columnProp: 'productGroupName3',
headerAlign: 'center',
align: 'left',
columnLabel: '商品组3名称',
@@ -1563,7 +1490,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -1635,7 +1562,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 160
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
@@ -2213,7 +2140,7 @@
trigger: ['blur','change']
}
],
- umId: [
+ umId2: [
{
required: true,
message: ' ',
@@ -2248,7 +2175,7 @@
trigger: ['blur','change']
}
],
- partType: [
+ partType2: [
{
required: true,
message: ' ',
@@ -2732,36 +2659,21 @@
bu: this.userBuList[0].buNo,
partNo: '',
partDesc: '',
- umId: '',
+ umId2: '',
umName: '',
spec: '',
active: 'Y',
- cinvSourceCode: '',
- sku: '',
- qtyBoxRoll: '',
- qtyRoll: '',
- partType: 'Purchased (raw)',
+ partType2: 'Purchased (raw)',
standardBoxQty: '',
- controlMes: '',
- cinvcname: '',
- otherGroup1: '',
- otherGroupName1: '',
- otherGroup2: '',
- otherGroupName2: '',
- otherGroup3: '',
- otherGroupName3: '',
- defaultWarehouseID: '',
- defaultWarehouseName: '',
+ productGroupId1: '',
+ productGroupName1: '',
+ productGroupId2: '',
+ productGroupName2: '',
+ productGroupId3: '',
+ productGroupName3: '',
familyID: '',
familyName: '',
- invdefinetype: '',
partDesceEn: '',
- moldCode: '',
- moldCodeRequired: '',
- serialNumberRequired: '',
- partMesType: '',
- productRev: '',
- invtype: '',
remark: '',
codeNo: '',
codeDesc: ''
@@ -2790,36 +2702,21 @@
buNo: row.buNo,
partNo: row.partNo,
partDesc: row.partDesc,
- umId: row.umId,
+ umId2: row.umId2,
umName: row.umName,
spec: row.spec,
active: row.active,
- cinvSourceCode: row.cinvSourceCode,
- sku: row.sku,
- qtyBoxRoll: row.qtyBoxRoll,
- qtyRoll: row.qtyRoll,
- partType: row.partType,
+ partType2: row.partType2,
standardBoxQty: row.standardBoxQty,
- controlMes: row.controlMes,
- cinvcname: row.cinvcname,
- otherGroup1: row.otherGroup1,
- otherGroupName1: row.otherGroupName1,
- otherGroup2: row.otherGroup2,
- otherGroupName2: row.otherGroupName2,
- otherGroup3: row.otherGroup3,
- otherGroupName3: row.otherGroupName3,
- defaultWarehouseID: row.defaultWarehouseID,
- defaultWarehouseName: row.defaultWarehouseName,
+ productGroupId1: row.productGroupId1,
+ productGroupName1: row.productGroupName1,
+ productGroupId2: row.productGroupId2,
+ productGroupName2: row.productGroupName2,
+ productGroupId3: row.productGroupId3,
+ productGroupName3: row.productGroupName3,
familyID: row.familyID,
familyName: row.familyName,
- invdefinetype: row.invdefinetype,
partDesceEn: row.partDesceEn,
- moldCode: row.moldCode,
- moldCodeRequired: row.moldCodeRequired,
- serialNumberRequired: row.serialNumberRequired,
- partMesType: row.partMesType,
- productRev: row.productRev,
- invtype: row.invtype,
remark: row.remark,
codeNo: row.codeNo,
codeDesc: row.codeDesc
@@ -3244,7 +3141,7 @@
this.$message.warning('请选择BU！')
return
}
- if (this.modalData.umId === '' || this.modalData.umId == null) {
+ if (this.modalData.umId2 === '' || this.modalData.umId2 == null) {
this.$message.warning('请选择计量单位！')
return
}
@@ -3519,15 +3416,15 @@
// 计量单位输入校验
umIdBlur (tagNo) {
- if (this.modalData.umId != null && this.modalData.umId !== '') {
+ if (this.modalData.umId2 != null && this.modalData.umId2 !== '') {
let tempData = {
tagno: tagNo,
- conditionSql: " and UMID = '" + this.modalData.umId + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
+ conditionSql: " and UMID = '" + this.modalData.umId2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
}
verifyData(tempData).then(({data}) => {
if (data && data.code === 0) {
if (data.baseListData.length > 0) {
- this.modalData.umId = data.baseListData[0].UMID
+ this.modalData.umId2 = data.baseListData[0].UMID
this.modalData.umName = data.baseListData[0].UMName
return
}
@@ -3539,82 +3436,62 @@
// 商品组1输入校验
productGroupId1Blur (tagNo) {
- if (this.modalData.otherGroup1 != null && this.modalData.otherGroup1 !== '') {
+ if (this.modalData.productGroupId1 != null && this.modalData.productGroupId1 !== '') {
let tempData = {
tagno: tagNo,
- conditionSql: " and product_group_id = '" + this.modalData.otherGroup1 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
+ conditionSql: " and product_group_id = '" + this.modalData.productGroupId1 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
verifyData(tempData).then(({data}) => {
if (data && data.code === 0) {
if (data.baseListData.length > 0) {
- this.modalData.otherGroup1 = data.baseListData[0].product_group_id
- this.modalData.otherGroupName1 = data.baseListData[0].product_group_name
+ this.modalData.productGroupId1 = data.baseListData[0].product_group_id
+ this.modalData.productGroupName1 = data.baseListData[0].product_group_name
return
}
}
})
}
- this.modalData.otherGroupName1 = ''
+ this.modalData.productGroupName1 = ''
},
// 商品组2输入校验
productGroupId2Blur (tagNo) {
- if (this.modalData.otherGroup2 != null && this.modalData.otherGroup2 !== '') {
+ if (this.modalData.productGroupId2 != null && this.modalData.productGroupId2 !== '') {
let tempData = {
tagno: tagNo,
- conditionSql: " and product_group_id = '" + this.modalData.otherGroup2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
+ conditionSql: " and product_group_id = '" + this.modalData.productGroupId2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
verifyData(tempData).then(({data}) => {
if (data && data.code === 0) {
if (data.baseListData.length > 0) {
- this.modalData.otherGroup2 = data.baseListData[0].product_group_id
- this.modalData.otherGroupName2 = data.baseListData[0].product_group_name
+ this.modalData.productGroupId2 = data.baseListData[0].product_group_id
+ this.modalData.productGroupName2 = data.baseListData[0].product_group_name
return
}
}
})
}
- this.modalData.otherGroupName2 = ''
+ this.modalData.productGroupName2 = ''
},
// 商品组3输入校验
productGroupId3Blur (tagNo) {
- if (this.modalData.otherGroup3 != null && this.modalData.otherGroup3 !== '') {
- let tempData = {
- tagno: tagNo,
- conditionSql: " and product_group_id = '" + this.modalData.otherGroup3 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
- }
- verifyData(tempData).then(({data}) => {
- if (data && data.code === 0) {
- if (data.baseListData.length > 0) {
- this.modalData.otherGroup3 = data.baseListData[0].product_group_id
- this.modalData.otherGroupName3 = data.baseListData[0].product_group_name
- return
- }
- }
- })
- }
- this.modalData.otherGroupName3 = ''
- },
-
- // 默认仓库输入校验
- defaultWarehouseBlur (tagNo) {
- if (this.modalData.defaultWarehouseID != null && this.modalData.defaultWarehouseID !== '') {
+ if (this.modalData.productGroupId3 != null && this.modalData.productGroupId3 !== '') {
let tempData = {
tagno: tagNo,
- conditionSql: " and warehouse_id = '" + this.modalData.defaultWarehouseID + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
+ conditionSql: " and product_group_id = '" + this.modalData.productGroupId3 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
verifyData(tempData).then(({data}) => {
if (data && data.code === 0) {
if (data.baseListData.length > 0) {
- this.modalData.defaultWarehouseID = data.baseListData[0].warehouse_id
- this.modalData.defaultWarehouseName = data.baseListData[0].warehouse_name
+ this.modalData.productGroupId3 = data.baseListData[0].product_group_id
+ this.modalData.productGroupName3 = data.baseListData[0].product_group_name
return
}
}
})
}
- this.modalData.defaultWarehouseName = ''
+ this.modalData.productGroupName3 = ''
},
// 物料分类输入校验
@@ -3676,17 +3553,14 @@
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
if (val === 510) {
- strVal = this.modalData.umId
+ strVal = this.modalData.umId2
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
} else if (val === 211) {
- strVal = this.modalData.otherGroup1
+ strVal = this.modalData.productGroupId1
} else if (val === 212) {
- strVal = this.modalData.otherGroup2
+ strVal = this.modalData.productGroupId2
} else if (val === 213) {
- strVal = this.modalData.otherGroup3
- } else if (val === 511) {
- strVal = this.modalData.defaultWarehouseID
- conSql = ''
+ strVal = this.modalData.productGroupId3
} else if (val === 214) {
strVal = this.modalData.familyID
} else if (val === 219) {
@@ -3701,20 +3575,17 @@
*/
getBaseData (val) {
if (this.tagNo === 510) {
- this.modalData.umId = val.UMID
+ this.modalData.umId2 = val.UMID
this.modalData.umName = val.UMName
} else if (this.tagNo === 211) {
- this.modalData.otherGroup1 = val.product_group_id
- this.modalData.otherGroupName1 = val.product_group_name
+ this.modalData.productGroupId1 = val.product_group_id
+ this.modalData.productGroupName1 = val.product_group_name
} else if (this.tagNo === 212) {
- this.modalData.otherGroup2 = val.product_group_id
- this.modalData.otherGroupName2 = val.product_group_name
+ this.modalData.productGroupId2 = val.product_group_id
+ this.modalData.productGroupName2 = val.product_group_name
} else if (this.tagNo === 213) {
- this.modalData.otherGroup3 = val.product_group_id
- this.modalData.otherGroupName3 = val.product_group_name
- } else if (this.tagNo === 511) {
- this.modalData.defaultWarehouseID = val.warehouse_id
- this.modalData.defaultWarehouseName = val.warehouse_name
+ this.modalData.productGroupId3 = val.product_group_id
+ this.modalData.productGroupName3 = val.product_group_name
} else if (this.tagNo === 214) {
this.modalData.familyID = val.family_id
this.modalData.familyName = val.family_name
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index ceae8a4..7c99c6d 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -1196,7 +1196,7 @@ export default {
columnWidth: 300
},
{
- columnProp: 'printUnit',
+ columnProp: 'printUnitName',
headerAlign: "center",
align: "center",
columnLabel: '计量单位',
@@ -1207,7 +1207,7 @@ export default {
columnWidth: 100
},
{
- columnProp: 'partType',
+ columnProp: 'partType2',
headerAlign: "center",
align: "center",
columnLabel: '零件类型',
@@ -1215,7 +1215,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
}
],
componentOperationColumnList: [
@@ -1661,7 +1661,7 @@ export default {
columnWidth: 300
},
{
- columnProp: 'printUnit',
+ columnProp: 'printUnitName',
headerAlign: "center",
align: "center",
columnLabel: '计量单位',
@@ -1672,7 +1672,7 @@ export default {
columnWidth: 100
},
{
- columnProp: 'partType',
+ columnProp: 'partType2',
headerAlign: "center",
align: "center",
columnLabel: '零件类型',
@@ -1680,7 +1680,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
- columnWidth: 150
+ columnWidth: 100
}
],
standardOperationColumnList: [
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 49b9907..9836756 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -1865,8 +1865,12 @@
this.$message.warning('请选择维修人员！')
return
}
- if (this.saveData.handlingMethod == null || this.saveData.handlingMethod === '') {
- this.$message.warning('请填写处理方式！')
+ if (this.saveData.faultReason === '' || this.saveData.faultReason == null || this.saveData.faultReason.length < 11) {
+ this.$message.warning('请填写故障原因，且大于十个字数！')
+ return
+ }
+ if (this.saveData.handlingMethod === '' || this.saveData.handlingMethod == null || this.saveData.handlingMethod.length < 11) {
+ this.$message.warning('请填写处理方式，且大于十个字数！')
return
}
saveOrderReportForDefect(this.saveData).then(({data}) => {