2023-11-16 设备和质量修改

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -213,6 +213,11 @@
           <el-button type="primary" @click="checkSparPartImageModal()">备件图片</el-button>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'反馈描述'">
+          <el-input v-model="detailData.feedBackDesc" readonly style="width: 505px"></el-input>
+        </el-form-item>
+      </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item :label="'设备编码'">
           <el-input v-model="detailData.objectID" readonly style="width: 159px"></el-input>
@@ -418,42 +423,6 @@
         departmentList:[],
         // 展示列集
         columnList: [
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 101018,
-          //   serialNumber: '101018TableOrderNo',
-          //   tableId: "101018Table",
-          //   tableName: "common",
-          //   columnProp: 'urgency',
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: '紧急程度',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: true,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 90,
-          // },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 101014,
-          //   serialNumber: '101014TableResult',
-          //   tableId: "101014Table",
-          //   tableName: "common",
-          //   columnProp: 'result',
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: '维修结论',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: true,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 80,
-          // },
           {
             userId: this.$store.state.user.name,
             functionId: 101014,
@@ -508,6 +477,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101018,
+            serialNumber: '101018TablePlanID',
+            tableId: "101018Table",
+            tableName: "common",
+            columnProp: 'feedBackDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '反馈描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101018,
@@ -1231,7 +1218,8 @@
           disposalMeasures: row.disposalMeasures,
           handlingMethod: row.handlingMethod,
           functionType: row.functionType,
-          resourceDesc: row.resourceDesc
+          resourceDesc: row.resourceDesc,
+          feedBackDesc: row.feedBackDesc
         }
         this.detailModelFlag = true
       },

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -148,13 +148,18 @@
               <el-button type="primary" @click="uploadSparPartImageModal()">备件图片</el-button>
             </el-form-item>
           </el-form>
+          <el-form :inline="true" label-position="top">
+            <el-form-item label="反馈描述:">
+              <el-input v-model="saveData.feedBackDesc" style="width: 389px"></el-input>
+            </el-form-item>
+          </el-form>
           <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
             <el-form-item >
               <span slot="label" @click="getOperatorList()"><a>选择机修人员</a></span>
               <el-input v-model="saveData.operatorName" style="width: 389px"></el-input>
             </el-form-item>
             <el-form-item :label="'维修结果'">
-              <el-select v-model="saveData.result" style="width: 120px">
+              <el-select v-model="saveData.result" style="width: 150px">
                 <el-option label="维修完成" value="维修完成"></el-option>
                 <el-option label="维修失败" value="维修失败"></el-option>
               </el-select>
@@ -461,6 +466,23 @@
             status: true,
             fixed: '',
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101020,
+            serialNumber: '101020TablePlanID',
+            tableId: "101020Table",
+            tableName: "common",
+            columnProp: 'feedBackDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '反馈描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101020,
@@ -692,7 +714,8 @@
           checkItemNo: '',
           reachDate: '',
           finishDate: '',
-          handlingMethod: ''
+          handlingMethod: '',
+          feedBackDesc: ''
         },
         operatorData: {
           site: this.$store.state.user.site,
@@ -1180,6 +1203,8 @@
 
       // 选择到达人员
       chooseReachOperator (row) {
+        this.saveData.operator = ''
+        this.saveData.operatorName = ''
         this.reachData = row
         this.chooseReachModelFlag = true
       },
@@ -1194,11 +1219,6 @@
           reachOperator: this.saveData.operator,
           reachOperatorName: this.saveData.operatorName
         }
-        this.$confirm(`是否确认到达?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
           reach(tempData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -1215,8 +1235,6 @@
               })
             }
           })
-        }).catch(() => {
-        })
       },
 
       // 执行
@@ -1241,7 +1259,8 @@
           reachDate: row.reachDate,
           operator: row.reachOperator,
           operatorName: row.reachOperatorName,
-          handlingMethod: row.handlingMethod
+          handlingMethod: row.handlingMethod,
+          feedBackDesc: row.feedBackDesc
         }
         this.queryHistoryRecord()
         this.detailModelFlag = true