2025-02-08

维修确认新增两个字段

src/views/main-sidebar.vue

@@ -8,8 +8,9 @@
         :collapseTransition="false"
         class="site-sidebar__menu">
         <el-menu-item style=" padding-left: 15px;" class="menu">
-          <span slot="title"> <el-input v-model="search" placeholder="搜索" class="custom-input"
-                                        @keyup.enter.native="searchMenu1" style="margin-left: -8px"></el-input></span>
+          <span slot="title">
+            <el-input v-model="search" placeholder="搜索" class="custom-input" @keyup.enter.native="searchMenu1" style="margin-left: -8px"></el-input>
+          </span>
           <i type="primary" class="el-icon-search" style="font-size: small" @click="searchMenu1()"></i>
         </el-menu-item>
         <el-menu-item index="home" @click="$router.push({ name: 'home' })">

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -399,14 +399,27 @@
 
     <el-dialog title="维修确认" top="22vh" :close-on-click-modal="false" v-drag :visible.sync="confirmDefectModal" width="320px">
       <el-form :inline="true" label-position="top">
-        <el-form-item style="margin-left: 83px" :label="'确认结果'">
-          <el-select filterable v-model="confirmData.confirmResult" style="width: 120px">
+        <el-form-item :label="'确认结果'">
+          <el-select v-model="confirmData.confirmResult" style="width: 135px">
             <el-option label="成功" value="Y"></el-option>
             <el-option label="失败" value="N"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="'维修评估'">
+          <el-select v-model="confirmData.confirmAssessment" style="width: 135px">
+            <el-option label="优秀" value="优秀"></el-option>
+            <el-option label="一般" value="一般"></el-option>
+            <el-option label="差" value="差"></el-option>
+            <el-option label="未完全修复" value="未完全修复"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
-      <el-footer style="height:35px;margin-top: 20px;text-align:center">
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'生产维修评估说明'">
+          <el-input type="textarea" v-model="confirmData.confirmRemark" :rows="3" resize='none' show-word-limit style="width: 285px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:30px;margin-top: 50px;text-align:center">
         <el-button style="margin-left: -12px" type="primary" @click="confirmDefectOrder()">保存</el-button>
         <el-button type="primary" @click="confirmDefectModal = false">关闭</el-button>
       </el-footer>
@@ -1178,6 +1191,8 @@
           orderNo: '',
           functionType: '',
           confirmResult: '',
+          confirmAssessment: '',
+          confirmRemark: '',
           confirmBy: ''
         },
         confirmDefectModal: false
@@ -1593,6 +1608,8 @@
           planID: row.planID,
           functionType: row.functionType,
           confirmResult: 'Y',
+          confirmAssessment: '优秀',
+          confirmRemark: '',
           confirmBy: this.$store.state.user.name
         }
         this.confirmDefectModal = true
@@ -1601,7 +1618,11 @@
       // 确认结果
       confirmDefectOrder () {
         if (this.confirmData.confirmResult === '' || this.confirmData.confirmResult == null) {
-          this.$message.warning('请选择维修结果！')
+          this.$message.warning('请选择确认结果！')
+          return
+        }
+        if (this.confirmData.confirmAssessment === '' || this.confirmData.confirmAssessment == null) {
+          this.$message.warning('请选择维修评估！')
           return
         }
         confirmDefectOrder(this.confirmData).then(({data}) => {

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -45,7 +45,7 @@
         </el-select>
       </el-form-item>
     </el-form>
-      <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
         <el-form-item :label="'更换核心配件编码'">
           <el-input v-model="searchData.corePartNo" clearable style="width: 120px"></el-input>
         </el-form-item>