TPM维修审核功能：增加审核退回功能，增加字段isReturn

src/views/modules/eam/eamWorkOrderForApprove.vue

@@ -279,7 +279,7 @@
           <el-input v-model="detailData.actualOperatorName" disabled style="width: 523px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()">取消审核</el-button>
+          <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()">审核退回</el-button>
           <el-button v-if="detailData.status === '待审核'" type="primary" @click="checkModal()">审核</el-button>
         </el-form-item>
         <el-form-item :label="' '">
@@ -1473,7 +1473,7 @@
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.submitData.status = '待审核'
+            this.submitData.status = '已到达'
             submitDefect(this.submitData).then(({data}) => {
               if (data && data.code === 0) {
                 this.getDataList()

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -318,7 +318,7 @@
               </el-form-item>
               <el-form-item :label="' '" style="margin-left: 20px">
                 <el-checkbox v-model="detailData.knowledgeFlag" true-label="Y">维修记录移至知识库</el-checkbox>
-                <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">取消审核</el-button>
+                <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">审核退回</el-button>
                 <el-button v-else type="primary" @click="checkModal()" style="margin-left: 10px">审核</el-button>
               </el-form-item>
 <!--              <el-form-item :label="' '">-->
@@ -2140,7 +2140,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.submitData.status = '待审核'
+          this.submitData.status = '已到达'
           submitDefect(this.submitData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()

src/views/modules/eam/eamWorkOrderForDefect2.vue

@@ -319,7 +319,7 @@
               </el-form-item>
               <el-form-item :label="' '" style="margin-left: 20px">
                 <el-checkbox v-model="detailData.knowledgeFlag" true-label="Y">维修记录移至知识库</el-checkbox>
-                <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">取消审核</el-button>
+                <el-button v-if="detailData.status === '已完工'" type="primary" @click="checkModal()" style="margin-left: 10px">审核退回</el-button>
                 <el-button v-else type="primary" @click="checkModal()" style="margin-left: 10px">审核</el-button>
               </el-form-item>
 <!--              <el-form-item :label="' '">-->
@@ -2142,7 +2142,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.submitData.status = '待审核'
+          this.submitData.status = '已到达'
           submitDefect(this.submitData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -212,10 +212,13 @@
           <el-form-item label="响应时长(m)">
             <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 v-model="saveData.shutdownWarranty" disabled style="width: 100px"></el-input>
+          <el-form-item label="停机保修" style="margin-left: 30px">
+            <el-input v-model="saveData.shutdownWarranty" disabled style="width: 68px"></el-input>
           </el-form-item>
-          <el-form-item label="维修结果" prop="result" style="margin-left: 80px">
+          <el-form-item label="审核退回" style="margin-left: 0px">
+            <el-input v-model="saveData.isReturn" disabled style="width: 68px"></el-input>
+          </el-form-item>
+          <el-form-item label="维修结果" prop="result" style="margin-left: 30px">
             <el-select v-model="saveData.result" style="width: 100px">
               <el-option label="维修完成" value="维修完成"></el-option>
               <el-option label="维修失败" value="维修失败"></el-option>
@@ -755,6 +758,7 @@
       return {
         coreComponentFlag: false,
         uploadDialog: false,
+        planPeople:'',
         uploadData: {
           folder: '',
           title: '',
@@ -2247,6 +2251,7 @@
         this.operatorData.bu = row.site + '_' + row.buNo
         this.reachData = row
         this.chooseReachModelFlag = true
+        this.planPeople = row.planOperatorName
       },
 
       // 到达
@@ -2255,6 +2260,12 @@
           this.$message.warning('请选择到达人员！')
           return
         }
+        if (!this.planPeople==''){
+          if (!this.saveData.operatorName.includes(this.planPeople)){
+            this.$message.warning('到达人员中不包含计划人员！')
+            return
+          }
+        }
         let tempData = {
           site: this.saveData.site,
           buNo: this.saveData.buNo,
@@ -2321,7 +2332,8 @@
           reachOperatorName: row.reachOperatorName,
           urgency: row.urgency,
           responseTime: row.responseTime,
-          shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
+          shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否',
+          isReturn: row.isReturn
         }
         this.activeTable = 'inspection_form'
         this.detailModelFlag = true
@@ -2352,6 +2364,12 @@
           this.$message.warning('请填写处理方式，且大于十个字数！')
           return
         }
+        if (!this.saveData.planOperatorName==''){
+          if (!this.saveData.operatorName.includes(this.saveData.planOperatorName)){
+            this.$message.warning('实际执行人员中不包含计划人员，请检查！')
+            return
+          }
+        }
         saveOrderReportForDefect(this.saveData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()

src/views/modules/reportWorkOrder/reportDefectOrder2.vue

@@ -204,10 +204,13 @@
           <el-form-item label="响应时长(m)">
             <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 v-model="saveData.shutdownWarranty" disabled style="width: 100px"></el-input>
+          <el-form-item label="停机保修" style="margin-left: 30px">
+            <el-input v-model="saveData.shutdownWarranty" disabled style="width: 68px"></el-input>
           </el-form-item>
-          <el-form-item label="维修结果" prop="result" style="margin-left: 80px">
+          <el-form-item label="审核退回退回" style="margin-left: 0px">
+            <el-input v-model="saveData.isReturn" disabled style="width: 68px"></el-input>
+          </el-form-item>
+          <el-form-item label="维修结果" prop="result" style="margin-left: 30px">
             <el-select v-model="saveData.result" style="width: 100px">
               <el-option label="维修完成" value="维修完成"></el-option>
               <el-option label="维修失败" value="维修失败"></el-option>
@@ -745,6 +748,7 @@ export default {
     return {
       coreComponentFlag: false,
       uploadDialog: false,
+      planPeople:'',
       uploadData: {
         folder: '',
         title: '',
@@ -2235,6 +2239,7 @@ export default {
       this.operatorData.bu = row.site + '_' + row.buNo
       this.reachData = row
       this.chooseReachModelFlag = true
+      this.planPeople = row.planOperatorName
     },
 
     // 到达
@@ -2243,6 +2248,12 @@ export default {
         this.$message.warning('请选择到达人员！')
         return
       }
+      if (!this.planPeople==''){
+        if (!this.saveData.operatorName.includes(this.planPeople)){
+          this.$message.warning('到达人员中不包含计划人员！')
+          return
+        }
+      }
       let tempData = {
         site: this.saveData.site,
         buNo: this.saveData.buNo,
@@ -2308,7 +2319,8 @@ export default {
         reachOperatorName: row.reachOperatorName,
         urgency: row.urgency,
         responseTime: row.responseTime,
-        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
+        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否',
+        isReturn: row.isReturn
       }
       this.activeTable = 'inspection_form'
       this.detailModelFlag = true
@@ -2339,6 +2351,12 @@ export default {
         this.$message.warning('请填写处理方式，且大于十个字数！')
         return
       }
+      if (!this.saveData.planOperatorName==''){
+        if (!this.saveData.operatorName.includes(this.saveData.planOperatorName)){
+          this.$message.warning('实际执行人员中不包含计划人员，请检查！')
+          return
+        }
+      }
       saveOrderReportForDefect(this.saveData).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()