diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index 8567f18..2f3f690 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -296,8 +296,7 @@
@@ -317,8 +316,15 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -515,31 +521,11 @@
},
watch: {
"saveModalData.bu"(newV, oldV) {
- if (newV.includes('RFID') && this.saveModalData.repairReportingType !== 'TPM红牌') {
- if (this.saveModalData.objectID && this.saveModalData.objectID.startsWith('B')) {
- this.saveModalData.repairType = '换线专家组'
- this.repairReportingTypeFlag = false // 允许编辑
- } else {
- this.saveModalData.repairType = '设备维修组'
- this.repairReportingTypeFlag = true // 不允许编辑
- }
- } else {
- this.saveModalData.repairType = '设备维修组'
- this.repairReportingTypeFlag = false // 允许编辑
- }
+ this.saveModalData.repairType = '设备维修组'
+ this.repairReportingTypeFlag = false // 允许编辑
},
"saveModalData.objectID"(newV, oldV) {
- // 当BU是RFID时,根据设备ID是否以B开头设置维修类型
- if (this.saveModalData.bu && this.saveModalData.bu.includes('RFID') &&
- this.saveModalData.repairReportingType !== 'TPM红牌') {
- if (newV && newV.startsWith('B')) {
- this.saveModalData.repairType = '换线专家组'
- this.repairReportingTypeFlag = false // 允许编辑
- } else {
- this.saveModalData.repairType = '设备维修组'
- this.repairReportingTypeFlag = true // 不允许编辑
- }
- }
+ // 设备编码变化时不再自动设置维修类型
}
},
data () {
@@ -637,7 +623,8 @@
repairReportingType: '',
repairType: '',
planOperator: '',
- planOperatorName: ''
+ planOperatorName: '',
+ lineChangeComplexity: ''
},
classesList: [],
operatorData: {
@@ -1175,6 +1162,13 @@
message: ' ',
trigger: ['blur','change']
}
+ ],
+ lineChangeComplexity: [
+ {
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }
]
},
saveMatterRules: {
@@ -1274,16 +1268,6 @@
buChangedMethod(){
if (this.saveModalData.bu == '2_01-Label'){
this.repairReportingTypeFlag = true
- } else if (this.saveModalData.bu.includes('RFID') &&
- this.saveModalData.repairReportingType !== 'TPM红牌') {
- // 当BU是RFID时,根据设备ID是否以B开头设置
- if (this.saveModalData.objectID && this.saveModalData.objectID.startsWith('B')) {
- this.saveModalData.repairType = '换线专家组'
- this.repairReportingTypeFlag = false // 允许编辑
- } else {
- this.saveModalData.repairType = '设备维修组'
- this.repairReportingTypeFlag = true // 不允许编辑
- }
} else {
this.repairReportingTypeFlag = false // 允许编辑
}
@@ -1291,11 +1275,6 @@
// 维修类型变化事件
repairTypeChange() {
// 当用户手动更改维修类型时的处理逻辑
- if (this.saveModalData.bu && this.saveModalData.bu.includes('RFID') &&
- this.saveModalData.objectID && !this.saveModalData.objectID.startsWith('B')) {
- // 如果是RFID BU且设备ID非B开头,强制设为设备维修组
- this.saveModalData.repairType = '设备维修组'
- }
},
// 报修方式改变事件
@@ -1347,7 +1326,8 @@
repairReportingType: '设备故障',
repairType: '设备维修组',
planOperator: '',
- planOperatorName: ''
+ planOperatorName: '',
+ lineChangeComplexity: ''
}
this.fileData = {
file: [],
@@ -1402,6 +1382,12 @@
this.$message.warning("请选择计划执行人员!")
return;
}
+ if (this.saveModalData.repairType === '换线专家组' &&
+ this.saveModalData.bu && this.saveModalData.bu.includes('RFID') &&
+ (this.saveModalData.lineChangeComplexity === '' || this.saveModalData.lineChangeComplexity == null)) {
+ this.$message.warning("请填写换线复杂度!")
+ return;
+ }
if (this.saveModalData.feedBackDesc === '' || this.saveModalData.feedBackDesc == null) {
this.$message.warning("请填写故障描述!")
return;
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 48b26f6..a959149 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -1357,6 +1357,24 @@ export default {
fixed: '',
columnWidth: 200,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101004002,
+ serialNumber: '101004002Table1LineChangeComplexity',
+ tableId: "101004002Table1",
+ tableName: "维修工单表",
+ columnProp: 'lineChangeComplexity',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '换线复杂度',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 150,
+ },
{
userId: this.$store.state.user.name,
functionId: 101004002,