From 46cbcd2365a1b7395994aa678c348d2ebaced157 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 6 Mar 2025 13:25:36 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-06=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamFeedBack.vue         | 53 +++++++++++++++----
 .../modules/eam/eamWorkOrderForDefect.vue     |  8 +--
 .../modules/eam/eamWorkOrderForDefect2.vue    |  8 +--
 .../reportWorkOrder/reportDefectOrder.vue     |  8 +--
 .../reportWorkOrder/reportDefectOrder2.vue    |  8 +--
 5 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index 1289402..46e9dd8 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -201,9 +201,6 @@
     <!-- 新增 -->
     <el-dialog title="设备故障报备" top="25vh" :close-on-click-modal="false" v-drag :visible.sync="saveModalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="反馈单号">
-          <el-input v-model="saveModalData.feedBackID" disabled style="width: 221px"></el-input>
-        </el-form-item>
         <el-form-item label="BU" prop="bu" :rules="saveRules.bu">
           <el-select v-model="saveModalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 221px">
             <el-option
@@ -218,6 +215,15 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="反馈单号">
+          <el-input v-model="saveModalData.feedBackID" disabled style="width: 105px"></el-input>
+        </el-form-item>
+        <el-form-item label="报修方式" prop="repairReportingType">
+          <el-select v-model="saveModalData.repairReportingType" @change="repairReportingTypeChange" style="width: 102px">
+            <el-option label="设备故障" value="设备故障"></el-option>
+            <el-option label="TPM红牌" value="TPM红牌"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="objectID">
@@ -228,7 +234,7 @@
           <el-input v-model="saveModalData.objectDesc" disabled style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="defectID">
           <span slot="label" @click="getBaseList(1055)"><a href="#">故障编码</a></span>
           <el-input v-model="saveModalData.defectID" style="width: 221px"></el-input>
@@ -237,7 +243,16 @@
           <el-input v-model="saveModalData.defectDesc" disabled style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form v-else :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item prop="defectID">
+          <span slot="label" @click="getBaseList(1058)"><a href="#">问题代码</a></span>
+          <el-input v-model="saveModalData.defectID" style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="问题描述">
+          <el-input v-model="saveModalData.defectDesc" disabled style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="故障日期">
           <el-date-picker style="width: 221px" v-model="saveModalData.defectDate" type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' placeholder="请选择故障日期" :editable=false :picker-options="pickerOptions"></el-date-picker>
         </el-form-item>
@@ -245,6 +260,14 @@
           <el-input v-model="saveModalData.feedBackDesc" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
+      <el-form v-else :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="反馈时间">
+          <el-date-picker style="width: 221px" v-model="saveModalData.defectDate" type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' placeholder="请选择故障日期" :editable=false :picker-options="pickerOptions"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="反馈描述">
+          <el-input v-model="saveModalData.feedBackDesc" style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
       <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="紧急程度" prop="urgency" :rules="saveRules.urgency">
           <el-select v-model="saveModalData.urgency" style="width: 104px">
@@ -253,12 +276,6 @@
             <el-option label="特急" value="特急"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="报修方式" prop="repairReportingType">
-          <el-select v-model="saveModalData.repairReportingType" style="width: 104px">
-            <el-option label="设备故障" value="设备故障"></el-option>
-            <el-option label="TPM红牌" value="TPM红牌"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="维修类型" prop="repairType">
           <el-select v-model="saveModalData.repairType" style="width: 104px">
             <el-option label="换线专家组" value="换线专家组"></el-option>
@@ -800,6 +817,12 @@
         })
       },
 
+      // 报修方式改变事件
+      repairReportingTypeChange () {
+        this.saveModalData.defectID = ''
+        this.saveModalData.defectDesc = ''
+      },
+
       // 新增模态框
       saveModal () {
         // 获取反馈单号
@@ -967,6 +990,10 @@
             strVal = this.saveModalData.defectID
             this.$refs.baseList.init(val, strVal)
           }
+          if (val === 1058) {
+            strVal = this.saveModalData.defectID
+            this.$refs.baseList.init(val, strVal)
+          }
         })
       },
 
@@ -983,6 +1010,10 @@
           this.saveModalData.defectID = val.DefectID
           this.saveModalData.defectDesc = val.DefectDesc
         }
+        if (this.tagNo === 1058) {
+          this.saveModalData.defectID = val.DefectID
+          this.saveModalData.defectDesc = val.DefectDesc
+        }
       },
 
       //导出excel
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index a860035..89758ad 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -284,7 +284,7 @@
             <el-input v-model="detailData.disposalMeasures" disabled style="width: 130px"></el-input>
           </el-form-item>
           <el-form-item label="是否停机保修">
-            <el-input disabled style="width: 100px"></el-input>
+            <el-input v-model="detailData.shutdownWarranty" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="实际执行时间" style="margin-left: 30px">
             <el-date-picker :disabled="detailData.status === '已完工'" style="width: 170px" v-model="detailData.actualDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
@@ -1429,7 +1429,8 @@ export default {
         confirmRemark: '',
         checkAssessment: '',
         checkNotes: '',
-        knowledgeFlag: ''
+        knowledgeFlag: '',
+        shutdownWarranty: ''
       },
       detailModelFlag: false,
       descImages: [],
@@ -2153,7 +2154,8 @@ export default {
     // 详情
     reportModal(row) {
       this.detailData = {
-        ...row
+        ...row,
+        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
       }
       this.activeTable = 'inspection_form'
       this.detailModelFlag = true
diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue
index 1ce9fe8..55541f8 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect2.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue
@@ -284,7 +284,7 @@
             <el-input v-model="detailData.disposalMeasures" disabled style="width: 130px"></el-input>
           </el-form-item>
           <el-form-item label="是否停机保修">
-            <el-input disabled style="width: 100px"></el-input>
+            <el-input v-model="detailData.shutdownWarranty" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="实际执行时间" style="margin-left: 30px">
             <el-date-picker :disabled="detailData.status === '已完工'" style="width: 170px" v-model="detailData.actualDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
@@ -1429,7 +1429,8 @@ export default {
         confirmRemark: '',
         checkAssessment: '',
         checkNotes: '',
-        knowledgeFlag: ''
+        knowledgeFlag: '',
+        shutdownWarranty: ''
       },
       detailModelFlag: false,
       descImages: [],
@@ -2154,7 +2155,8 @@ export default {
     // 详情
     reportModal(row) {
       this.detailData = {
-        ...row
+        ...row,
+        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
       }
       this.activeTable = 'inspection_form'
       this.detailModelFlag = true
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 12dd8d0..2c4d0e8 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -207,7 +207,7 @@
             <el-input v-model="saveData.responseTime" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="是否停机保修" style="margin-left: 30px">
-            <el-input  disabled style="width: 100px"></el-input>
+            <el-input v-model="saveData.shutdownWarranty" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="维修结果" prop="result" style="margin-left: 80px">
             <el-select v-model="saveData.result" style="width: 100px">
@@ -1146,7 +1146,8 @@
           reachOperator: '',
           reachOperatorName: '',
           urgency: '',
-          responseTime: ''
+          responseTime: '',
+          shutdownWarranty: ''
         },
         operatorData: {
           site: '',
@@ -2260,7 +2261,8 @@
           reachOperator: row.reachOperator,
           reachOperatorName: row.reachOperatorName,
           urgency: row.urgency,
-          responseTime: row.responseTime
+          responseTime: row.responseTime,
+          shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
         }
         this.activeTable = 'inspection_form'
         this.detailModelFlag = true
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
index 9b1ebec..96f44ea 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
@@ -207,7 +207,7 @@
             <el-input v-model="saveData.responseTime" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="是否停机保修" style="margin-left: 30px">
-            <el-input  disabled style="width: 100px"></el-input>
+            <el-input v-model="saveData.shutdownWarranty" disabled style="width: 100px"></el-input>
           </el-form-item>
           <el-form-item label="维修结果" prop="result" style="margin-left: 80px">
             <el-select v-model="saveData.result" style="width: 100px">
@@ -1146,7 +1146,8 @@ export default {
         reachOperator: '',
         reachOperatorName: '',
         urgency: '',
-        responseTime: ''
+        responseTime: '',
+        shutdownWarranty: ''
       },
       operatorData: {
         site: '',
@@ -2260,7 +2261,8 @@ export default {
         reachOperator: row.reachOperator,
         reachOperatorName: row.reachOperatorName,
         urgency: row.urgency,
-        responseTime: row.responseTime
+        responseTime: row.responseTime,
+        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
       }
       this.activeTable = 'inspection_form'
       this.detailModelFlag = true