From c33f6f3a3cb45cef6f33296ed845de2de4429b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 10 Nov 2023 17:38:16 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-10=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/eamWorkOrderForMaintenance.vue        |  25 ++--
 .../qc/com_qc_itemImage_upload_file.vue       |   8 +-
 .../com_eam_itemImage_upload_file.vue         |   2 +-
 .../reportWorkOrder/reportCheckOrder.vue      |  47 ++++----
 .../reportMaintenanceOrder.vue                | 114 +++++++++++++-----
 .../reportWorkOrder/report_image_upload.vue   |   2 +-
 6 files changed, 124 insertions(+), 74 deletions(-)

diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index 929ae59..6e5f1c9 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -136,7 +136,7 @@
     </el-pagination>
 
     <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
-      <el-form :inline="true"  label-position="top"  >
+      <el-form :inline="true" label-position="top"  >
         <el-form-item :label="'工厂编码'">
           <el-input v-model="saveData.site" disabled style="width: 120px"></el-input>
         </el-form-item>
@@ -227,16 +227,19 @@
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop=""-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            min-width="80"-->
-<!--            label="是否完成">-->
-<!--            <template slot-scope="scope">-->
-<!--              {{scope.row.finishFlag=='Y'?"是":"否"}}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="实测值">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.valueTypeDb === 'T' && saveData.status === '待审核'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'T' && saveData.status === '已完工'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N' && saveData.status === '待审核'" v-model="scope.row.numberValue" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N' && saveData.status === '已完工'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             prop=""
             header-align="center"
diff --git a/src/views/modules/qc/com_qc_itemImage_upload_file.vue b/src/views/modules/qc/com_qc_itemImage_upload_file.vue
index c7b673f..ee016d4 100644
--- a/src/views/modules/qc/com_qc_itemImage_upload_file.vue
+++ b/src/views/modules/qc/com_qc_itemImage_upload_file.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" :before-close="closeDialog" width="390px" style="height: 530px;" class="customer-dialog">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" :before-close="closeDialog" :showClose="false" width="390px" style="height: 530px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-row>
           <el-col :span="12" style="width:36%">
             <el-form-item class="customer-item" label="检验单号">
-              <el-input v-model="pageData.orderNo" style="width: 120px;" disabled ></el-input>
+              <el-input v-model="pageData.inspectionNo" style="width: 120px;" disabled ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -93,7 +93,7 @@ export default {
           for (let i = 0; i < data.rows.length; i++) {
             this.descImgs.push(data.rows[i])
           }
-        }else {
+        } else {
           this.$message.warning(data.msg)
         }
       })
@@ -111,7 +111,7 @@ export default {
       this.fileList.push(file)
     },
     /*关闭modal*/
-    closeDialog(){
+    closeDialog () {
       this.fileList = []
       // 刷新报工的页面
       this.$emit('refreshPageTables2')
diff --git a/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue b/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
index 33e1765..4f5d5ef 100644
--- a/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
+++ b/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" :before-close="closeDialog" width="390px" style="height: 530px;" class="customer-dialog">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" :before-close="closeDialog" :showClose="false" width="390px" style="height: 530px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-row>
           <el-col :span="12" style="width:36%">
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index 36177b9..4827a1e 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -212,8 +212,8 @@
                 min-width="80"
                 label="实测值">
                 <template slot-scope="scope">
-                  <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-                  <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                  <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                  <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
                   <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
                     <el-option
                       v-for="item in scope.row.availableList"
@@ -522,23 +522,6 @@
             status: true,
             fixed: '',
           },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 101019,
-          //   serialNumber: '101019TableActualOperatorName',
-          //   tableId: "101019Table",
-          //   tableName: "common",
-          //   columnProp: 'actualOperatorName',
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: '实际机修人员',
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          // },
           {
             userId: this.$store.state.user.name,
             functionId: 101019,
@@ -986,6 +969,19 @@
       this.getDataList()
     },
     methods: {
+      // 回车选中下一行
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailList.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
+
       /**
        * 刷新项目
        */
@@ -1148,11 +1144,13 @@
           itemList: [],
           checkResult: '',
           functionType: 'A',
-          propertiesCode: row.propertiesCode
+          propertiesCode: row.propertiesCode,
+          startDate: new Date(),
+          endDate: ''
         }
-        this.getInspectionFormData();
-        this.queryHistoryRecord();
-        this.detailModelFlag = true;
+        this.getInspectionFormData()
+        this.queryHistoryRecord()
+        this.detailModelFlag = true
       },
       async saveCheckReport(){
         let tempFlag = 'N'
@@ -1207,8 +1205,7 @@
               message: '操作成功',
               type: 'success',
               duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
             })
           } else {
             this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 27a2f91..4c270c7 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -198,6 +198,33 @@
                   </div>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop=""
+                header-align="center"
+                align="right"
+                min-width="80"
+                label="实测值">
+                <template slot-scope="scope">
+                  <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T' && scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                  <el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                  <el-select v-if="scope.row.valueTypeDb === 'T' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+                    <el-option
+                      v-for="item in scope.row.availableList"
+                      :key="index"
+                      :label="item.availableValue"
+                      :value="item.availableValue">
+                    </el-option>
+                  </el-select>
+                  <el-select v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+                    <el-option
+                      v-for="item in scope.row.availableList"
+                      :key="index"
+                      :label="item.availableValue"
+                      :value="item.availableValue">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop=""
                 header-align="center"
@@ -289,6 +316,17 @@
               {{scope.row.finishFlag=='Y'?"是":"否"}}
             </template>
           </el-table-column>
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="实测值">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.valueTypeDb === 'T'" disabled v-model="scope.row.textValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N'" disabled v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             prop=""
             header-align="center"
@@ -1135,6 +1173,19 @@
       this.getDataList()
     },
     methods: {
+      // 回车选中下一行
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailList.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
+
       /**
        * 刷新项目
        */
@@ -1226,6 +1277,7 @@
           this.queryHistoryRecord();
         }
       },
+
       // 检验单
       getInspectionFormData(){
         let tempData = {
@@ -1246,6 +1298,7 @@
           }
         })
       },
+
       // 点检记录
       queryHistoryRecord(){
         let tempData = {
@@ -1261,6 +1314,7 @@
           }
         })
       },
+
       // 详情
       detailModal(row){
         let tempData = {
@@ -1273,7 +1327,6 @@
         this.historyDetailModelFlag = true;
       },
 
-
       // 校验用户是否收藏
       favoriteIsOk() {
         let userFavorite = {
@@ -1355,12 +1408,8 @@
         })
         return this.exportList;
       },
-      startDownload() {
-
-      },
-      finishDownload() {
-
-      },
+      startDownload() {},
+      finishDownload() {},
       fields() {
         let json = "{"
         this.columnList.forEach((item, index) => {
@@ -1447,23 +1496,8 @@
         this.detailModelFlag = true
       },
 
-      saveCheckReport(){
-        // if(this.saveData.startDate === ''||this.saveData.startDate == null){
-        //   this.$message.warning('请输入开始时间！')
-        //   return
-        // }
-        // if(this.saveData.endDate === ''||this.saveData.endDate == null){
-        //   this.$message.warning('请输入结束时间！')
-        //   return
-        // }
-        // if(this.saveData.workTime === 0){
-        //   this.$message.warning('工作时长不能为0！')
-        //   return
-        // }
-        // if(this.saveData.workTime < 0){
-        //   this.$message.warning('工作时长不能小于0！')
-        //   return
-        // }
+      async saveCheckReport(){
+        let tempFlag = 'N'
         if(this.saveData.checkResult === ''||this.saveData.checkResult == null){
           this.$message.warning('请选择维保结论！')
           return
@@ -1472,13 +1506,30 @@
           this.$message.warning('请选择异常原因！')
           return
         }
+        for (let i = 0; i < this.detailList.length; i++) {
+          if(this.detailList[i].valueTypeDb === 'N' && (this.detailList[i].numberValue === '' || this.detailList[i].numberValue == null)){
+            this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！')
+            return
+          }
+          if(this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){
+            if((this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){
+              this.detailList[i].itemResult = '不合格'
+            }
+          }
+        }
+        if (this.saveData.checkResult == '不合格') {
+          this.detailList.forEach(val => {
+            if (val.itemResult == '不合格') {
+              tempFlag = 'Y'
+            }
+          })
+          if (tempFlag != 'Y') {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
-          // for (let j = 0; j < this.saveData.itemList.length ; j++) {
-          //   if(this.saveData.itemList[j].itemResult === '' || this.saveData.itemList[j].itemResult == null){
-          //     this.saveData.itemList[j].itemResult = '合格'
-          //   }
-          // }
-        saveCheckOrderReport(this.saveData).then(({data}) => {
+        await saveCheckOrderReport(this.saveData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
             this.detailModelFlag = false
@@ -1486,8 +1537,7 @@
               message: '操作成功',
               type: 'success',
               duration: 1500,
-              onClose: () => {
-              }
+              onClose: () => {}
             })
           } else {
             this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/reportWorkOrder/report_image_upload.vue b/src/views/modules/reportWorkOrder/report_image_upload.vue
index 2c762d3..9c29ea5 100644
--- a/src/views/modules/reportWorkOrder/report_image_upload.vue
+++ b/src/views/modules/reportWorkOrder/report_image_upload.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 550px;" class="customer-dialog">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="390px" :showClose="false" style="height: 550px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-row>
           <el-col :span="12">