From 927a14625018cd23b03531270919cb07dd40f63a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 6 Dec 2023 15:24:04 +0800
Subject: [PATCH] =?UTF-8?q?2023-12-06=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/eamWorkOrderForCheck.vue      |  3 ++-
 .../eam/eamWorkOrderForMaintenance.vue        |  1 +
 .../reportWorkOrder/reportCheckOrder.vue      | 23 ++++++++++++++-----
 .../reportWorkOrder/reportDefectOrder.vue     |  1 +
 .../reportMaintenanceOrder.vue                |  1 +
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index ca4441c..f89ad86 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -377,6 +377,7 @@
           planDate: new Date(),
           page: 1,
           limit: 10,
+          searchType: 'checkOrder'
         },
         height: 200,
         pageIndex: 1,
@@ -982,7 +983,7 @@
       },
 
       // 重置查询时间
-      searchClick(){
+      searchClick () {
         this.searchData.planDate = ''
         this.getDataList()
       },
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index e5a4857..fddd3fc 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -425,6 +425,7 @@
           page: 1,
           planDate: new Date(),
           limit: 10,
+          searchType: 'maintenanceOrder'
         },
         height: 200,
         pageIndex: 1,
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index 435b182..146e16f 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -59,6 +59,7 @@
         </download-excel>
       </el-form-item>
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList"
@@ -111,6 +112,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
@@ -123,9 +125,6 @@
 
     <el-dialog title="执行点检工单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
-<!--        <el-form-item :label="'工厂编码'">-->
-<!--          <el-input v-model="saveData.site" disabled style="width: 120px"></el-input>-->
-<!--        </el-form-item>-->
         <el-form-item :label="'工单号'">
           <el-input v-model="saveData.orderNo" disabled style="width: 221px"></el-input>
         </el-form-item>
@@ -237,6 +236,16 @@
                   </el-select>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop=""
+                header-align="center"
+                align="center"
+                min-width="120"
+                label="备注">
+                <template slot-scope="scope">
+                  <el-input :ref="`itemNotes${scope.$index}`" v-model="scope.row.itemNotes" @keyup.enter.native="focusNextInput(scope.$index, 'itemNotes')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop=""
                 header-align="center"
@@ -351,6 +360,7 @@
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
     <!-- 上传文件的modal -->
     <comEamItemImageUploadFile ref="comEamItemImageUploadFile" @refreshPageTables="getInspectionFormData()" v-drag></comEamItemImageUploadFile>
   </div>
@@ -422,6 +432,7 @@
           endDate: '',
           page: 1,
           limit: 10,
+          searchType: 'reportCheck'
         },
         height: 200,
         pageIndex: 1,
@@ -1074,7 +1085,7 @@
         }
       },
       // 重置查询时间
-      searchClick(){
+      searchClick () {
         this.searchData.planDate = ''
         this.getDataList()
       },
@@ -1092,7 +1103,7 @@
           this.dataListLoading = false
         })
       },
-      //导出excel
+      // 导出excel
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
@@ -1185,7 +1196,7 @@
             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)){
+            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 = '不合格'
             }
           }
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 3e4aba4..88bede1 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -394,6 +394,7 @@
           endDate:'',
           page: 1,
           limit: 10,
+          searchType: 'reportDefect'
         },
         height: 200,
         pageIndex: 1,
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 0da0084..f9ecef2 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -472,6 +472,7 @@
           endDate:'',
           page: 1,
           limit: 10,
+          searchType: 'reportMaintenance'
         },
         height: 200,
         pageIndex: 1,