-
-
-
-
-
-
-
{
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index b034b5e..1204a6a 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -482,7 +482,7 @@
-
+
@@ -507,7 +507,7 @@
-
+
@@ -515,6 +515,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1188,7 +1240,23 @@ export default {
updateBy: '',
lineSequence: '',
consumptionItem: '',
- productFlag: ''
+ productFlag: '',
+ familyID: '',
+ productionData: undefined,
+ materialData: undefined,
+ finishedProductData: undefined,
+ consumptionLoss: undefined,
+ coatingLength: undefined,
+ glueWeight: undefined,
+ materialWidth: undefined,
+ widthConversion: undefined,
+ materialLength: undefined,
+ materialThickness: undefined,
+ areaConversion: undefined,
+ densityConversion: undefined,
+ materialWeight: undefined,
+ materialLength2: undefined,
+ unitConversion: undefined
},
partData: {
site: '',
@@ -2077,7 +2145,23 @@ export default {
copyAlternativeModelFlag: false,
headerSaveFlag: false,
menuId: this.$route.meta.menuId,
- batchComponentPartModelFlag: false
+ batchComponentPartModelFlag: false,
+ // ======== 子物料字段分类集合 ========
+ productionDataFamily: ['RFID003', 'RFID004', 'RFID005', 'RFID006', 'RFID007', 'RFID008', 'RFID009', 'RFID012', 'RFID023', 'RFID024', 'RFID025', 'RFID027'],
+ materialDataFamily: ['RFID011', 'RFID020', 'RFID021', 'RFID022'],
+ finishedProductDataFamily: ['RFID020', 'RFID021', 'RFID022'],
+ consumptionLossFamily: ['RFID001', 'RFID002', 'RFID014', 'RFID015', 'RFID016', 'RFID017', 'RFID018', 'RFID019'],
+ coatingLengthFamily: ['RFID013'],
+ glueWeightFamily: ['RFID013'],
+ materialWidthFamily: ['RFID014', 'RFID015'],
+ widthConversionFamily: ['RFID014', 'RFID015'],
+ materialLengthFamily: ['RFID016', 'RFID017'],
+ materialThicknessFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
+ areaConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
+ densityConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'],
+ materialWeightFamily: ['RFID018', 'RFID019'],
+ materialLength2Family: ['RFID018', 'RFID019'],
+ unitConversionFamily: ['RFID018', 'RFID019'],
}
},
@@ -2554,10 +2638,6 @@ export default {
this.$message.warning('请先选择替代！')
return
}
- // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
- // this.$message.warning('不可编辑的替代状态!')
- // return
- // }
this.componentData = {
flag: '1',
site: this.modalData.site,
@@ -2583,7 +2663,23 @@ export default {
createBy: this.$store.state.user.name,
lineSequence: '',
consumptionItem: 'Consumed',
- productFlag: 'component'
+ productFlag: 'component',
+ familyID: '',
+ productionData: undefined,
+ materialData: undefined,
+ finishedProductData: undefined,
+ consumptionLoss: undefined,
+ coatingLength: undefined,
+ glueWeight: undefined,
+ materialWidth: undefined,
+ widthConversion: undefined,
+ materialLength: undefined,
+ materialThickness: undefined,
+ areaConversion: undefined,
+ densityConversion: undefined,
+ materialWeight: undefined,
+ materialLength2: undefined,
+ unitConversion: undefined
}
// 获取子料的序号
getComponentLineSequence(this.componentData).then(({data}) => {
@@ -2699,10 +2795,6 @@ export default {
* 子明细编辑模态框
*/
updateComponentModal (row) {
- // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
- // this.$message.warning('不可编辑的替代状态!')
- // return
- // }
this.componentData = {
flag: '2',
site: row.site,
@@ -2728,7 +2820,23 @@ export default {
updateBy: this.$store.state.user.name,
lineSequence: row.lineSequence,
consumptionItem: row.consumptionItem,
- productFlag: 'component'
+ productFlag: 'component',
+ familyID: row.familyID,
+ productionData: row.productionData == null ? undefined : row.productionData,
+ materialData: row.materialData == null ? undefined : row.materialData,
+ finishedProductData: row.finishedProductData == null ? undefined : row.finishedProductData,
+ consumptionLoss: row.consumptionLoss == null ? undefined : row.consumptionLoss,
+ coatingLength: row.coatingLength == null ? undefined : row.coatingLength,
+ glueWeight: row.glueWeight == null ? undefined : row.glueWeight,
+ materialWidth: row.materialWidth == null ? undefined : row.materialWidth,
+ widthConversion: row.widthConversion == null ? undefined : row.widthConversion,
+ materialLength: row.materialLength == null ? undefined : row.materialLength,
+ materialThickness: row.materialThickness == null ? undefined : row.materialThickness,
+ areaConversion: row.areaConversion == null ? undefined : row.areaConversion,
+ densityConversion: row.densityConversion == null ? undefined : row.densityConversion,
+ materialWeight: row.materialWeight == null ? undefined : row.materialWeight,
+ materialLength2: row.materialLength2 == null ? undefined : row.materialLength2,
+ unitConversion: row.unitConversion == null ? undefined : row.unitConversion,
}
this.componentDisableFlag = true
this.componentSaveModal = true
@@ -3002,6 +3110,7 @@ export default {
this.componentData.componentPartDesc = row.partDesc
this.componentData.printUnit = row.printUnit
this.componentData.printUnitName = row.printUnitName
+ this.componentData.familyID = row.familyID
this.componentPartModelFlag = false
},
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 72e511e..f333f74 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -1913,11 +1913,17 @@
// 到达
reach () {
+ if (this.saveData.operator === '' || this.saveData.operator == null) { // 2025-02-13 海波要求
+ this.$message.warning('请选择到达人员！')
+ return
+ }
let tempData = {
site: this.saveData.site,
buNo: this.saveData.buNo,
functionType: 'C',
orderNo: this.reachData.orderNo,
+ feedBackId: this.reachData.feedBackId,
+ objectID: this.reachData.objectID,
status: '已到达',
reachOperator: this.saveData.operator,
reachOperatorName: this.saveData.operatorName
@@ -1961,8 +1967,8 @@
checkWorkPlanId: row.checkWorkPlanId,
checkItemNo: row.checkItemNo,
reachDate: row.reachDate,
- operator: row.reachOperator,
- operatorName: row.reachOperatorName,
+ operator: row.result == null ? row.reachOperator : row.adminID,
+ operatorName: row.result == null ? row.reachOperatorName : row.operator,
handlingMethod: row.handlingMethod,
feedBackDesc: row.feedBackDesc,
faultReason: row.faultReason,