From be41fab7d3c8267a3fd31dd9905e5897e36c19a7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 29 Mar 2024 17:47:15 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-29=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportWorkOrder/reportCheckOrder.vue      | 59 +++++++++----
 .../reportMaintenanceOrder.vue                | 88 ++++++++++---------
 2 files changed, 87 insertions(+), 60 deletions(-)

diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index b1802b8..02b70bc 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -7,7 +7,7 @@
         </span>
     </div>
 
-    <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="'BU'">
         <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
           <el-option
@@ -57,7 +57,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" ">
-        <el-button @click="searchClick()">查询</el-button>
+        <el-button @click="searchClick">查询</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -103,7 +103,7 @@
         fixed="right"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.status==='未开工'" @click="reportModal(scope.row)">执行</a>
+          <el-link style="cursor: pointer" v-if="scope.row.status==='未开工'" @click="reportModal(scope.row)">执行</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -119,7 +119,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" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList">
         <el-form-item :label="'工单号'">
           <el-input v-model="saveData.orderNo" disabled style="width: 221px"></el-input>
         </el-form-item>
@@ -145,10 +145,10 @@
           <el-input class="numInput" v-model="saveData.workTime" type="number" readonly :min="0" style="width: 100px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="refreshItem()">刷新项目</el-button>
+          <el-button type="primary" @click="refreshItem">刷新项目</el-button>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList">
         <el-form-item :label="'执行结果备注'">
           <el-input type="textarea" v-model="saveData.remark" :rows="2" resize='none' show-word-limit style="width: 1177px;height: 20px"></el-input>
         </el-form-item>
@@ -210,9 +210,9 @@
                 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-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; 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')" @change="changeValue(scope.row)" type="number" style="height: 11px; 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" allow-create>
                     <el-option
                       v-for="item in scope.row.availableList"
                       :key="index"
@@ -220,7 +220,7 @@
                       :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-select v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px" allow-create>
                     <el-option
                       v-for="item in scope.row.availableList"
                       :key="index"
@@ -237,7 +237,7 @@
                 min-width="80"
                 label="检验结论">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="请选择">
+                  <el-select v-model="scope.row.itemResult" style="height: 11px" placeholder="请选择">
                     <el-option label="合格" value="合格" style="color: green"></el-option>
                     <el-option label="不合格" value="不合格" style="color: red"></el-option>
                   </el-select>
@@ -250,7 +250,7 @@
                 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>
+                  <el-input :ref="`itemNotes${scope.$index}`" v-model="scope.row.itemNotes" @keyup.enter.native="focusNextInput(scope.$index, 'itemNotes')" style="height: 11px; width: 98%"></el-input>
                 </template>
               </el-table-column>
             </el-table>
@@ -284,16 +284,14 @@
               width="100"
               label="操作">
               <template slot-scope="scope">
-                <a type="text" size="small" @click="detailModal(scope.row)">详情</a>
+                <el-link style="cursor: pointer" @click="detailModal(scope.row)">详情</el-link>
               </template>
             </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
-<!--        <el-button type="primary" @click="">点检单</el-button>-->
-<!--        <el-button type="primary" @click="queryHistoryRecord()">点检记录</el-button>-->
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="saveCheckReport()">保存</el-button>
+        <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -327,8 +325,8 @@
             min-width="80"
             label="实测值">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.valueTypeDb === 'T'" 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'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" readonly style="height: 11px; width: 98%"></el-input>
+              <el-input v-else v-model="scope.row.textValue" readonly style="height: 11px; width: 98%"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -354,7 +352,7 @@
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     <!-- 上传文件的modal -->
-    <comEamItemImageUploadFile ref="comEamItemImageUploadFile" @refreshPageTables="getInspectionFormData()" v-drag></comEamItemImageUploadFile>
+    <comEamItemImageUploadFile ref="comEamItemImageUploadFile" @refreshPageTables="getInspectionFormData" v-drag></comEamItemImageUploadFile>
   </div>
 </template>
 
@@ -1073,6 +1071,29 @@
 
 
     methods: {
+      // 实测值内容改变事件
+      changeValue (row) {
+        if (row.minValue == null && row.maxValue != null) {
+          if (row.numberValue > row.maxValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        } else if (row.maxValue == null && row.minValue != null) {
+          if (row.numberValue < row.minValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        } else if (row.minValue != null && row.maxValue != null) {
+          if (row.numberValue < row.minValue || row.numberValue > row.maxValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        }
+      },
+
       // 取消小键盘
       cancelKeyboard (e) {
         // this.$refs.objectID
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 29dd7e0..582f3c1 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -7,7 +7,7 @@
         </span>
     </div>
 
-    <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="'BU'">
         <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
           <el-option
@@ -45,7 +45,7 @@
       <el-form-item style="margin-top: 23px;">
         <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
       </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
@@ -55,9 +55,9 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label=" ">
-      <el-button @click="searchClick()">查询</el-button>
+      <el-button @click="searchClick">查询</el-button>
       <download-excel
-        :fields="fields()"
+        :fields="fields"
         :data="exportData"
         type="xls"
         :name="exportName"
@@ -77,7 +77,6 @@
       :height="height"
       :data="dataList"
       border
-      v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
@@ -119,7 +118,7 @@
     </el-pagination>
 
     <el-dialog title="执行维保工单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1274px">
-      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
+      <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>-->
@@ -130,7 +129,7 @@
           <el-input v-model="saveData.planOperatorName" disabled style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item >
-          <span slot="label" style="" @click="getOperatorList()"><a>协同人员</a></span>
+          <span style="cursor: pointer" slot="label" @click="getOperatorList"><a>协同人员</a></span>
           <el-input v-model="saveData.operatorName" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'到达时间:'">
@@ -153,10 +152,10 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="' '">
-          <el-button type="primary" @click="refreshItem()">刷新项目</el-button>
+          <el-button type="primary" @click="refreshItem">刷新项目</el-button>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList">
         <el-form-item :label="'执行结果备注'">
           <el-input type="textarea" v-model="saveData.remark" :rows="3" resize='none' show-word-limit style="width: 1251px;height: 20px"></el-input>
         </el-form-item>
@@ -168,7 +167,6 @@
               :height="200"
               :data="detailList"
               border
-              v-loading="dataListLoading"
               @selection-change="selectionChangeHandle"
               style="width: 100%;">
               <el-table-column
@@ -215,9 +213,9 @@
                 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-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; 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')" @change="changeValue(scope.row)" type="number" style="height: 11px; 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" allow-create>
                     <el-option
                       v-for="item in scope.row.availableList"
                       :key="index"
@@ -225,7 +223,7 @@
                       :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-select v-if="scope.row.valueTypeDb === 'N' && scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px" allow-create>
                     <el-option
                       v-for="item in scope.row.availableList"
                       :key="index"
@@ -242,7 +240,7 @@
                 min-width="80"
                 label="检验结论">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="请选择">
+                  <el-select v-model="scope.row.itemResult" style="height: 11px" placeholder="请选择">
                     <el-option label="合格" value="合格" style="color: green"></el-option>
                     <el-option label="不合格" value="不合格" style="color: red"></el-option>
                   </el-select>
@@ -257,7 +255,6 @@
             :height="200"
             :data="HistoryRecordList"
             border
-            v-loading="dataListLoading"
             style="width: 100%;">
             <el-table-column
               v-for="(item,index) in columnHistoryList" :key="index"
@@ -281,14 +278,14 @@
               width="100"
               label="操作">
               <template slot-scope="scope">
-                <a type="text" size="small" @click="detailModal(scope.row)">详情</a>
+                <el-link style="cursor: pointer" @click="detailModal(scope.row)">详情</el-link>
               </template>
             </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="saveCheckReport()">保存</el-button>
+        <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -299,7 +296,6 @@
           :height="300"
           :data="historyDetailList"
           border
-          v-loading="dataListLoading"
           style="width: 100%;">
           <el-table-column
             v-for="(item,index) in columnHistoryDetailList" :key="index"
@@ -333,8 +329,8 @@
             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>
+              <el-input v-if="scope.row.valueTypeDb === 'N'" disabled v-model="scope.row.numberValue" type="number" style="height: 11px; width: 98%"></el-input>
+              <el-input v-else disabled v-model="scope.row.textValue" style="height: 11px; width: 98%"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -344,7 +340,7 @@
             min-width="80"
             label="检验结论">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
+              <el-select v-model="scope.row.itemResult" disabled style="height: 11px">
                 <el-option label="合格" value="合格"></el-option>
                 <el-option label="不合格" value="不合格"></el-option>
               </el-select>
@@ -372,13 +368,13 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="'用户编码'">
-            <el-input v-model="operatorData.adminID"  style="width: 120px"></el-input>
+            <el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="'用户姓名'">
-            <el-input v-model="operatorData.adminName"  style="width: 120px"></el-input>
+            <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getOperatorList()">查询</el-button>
+            <el-button type="primary" @click="getOperatorList">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -388,7 +384,6 @@
           @row-click="operatorClickRow"
           @selection-change="selectionChangeHandle2"
           border
-          v-loading="dataListLoading"
           style="width: 100%;">
           <el-table-column
             type="selection"
@@ -408,21 +403,21 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="confirmOperator()">确认</el-button>
+        <el-button type="primary" @click="confirmOperator">确认</el-button>
         <el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
     <!-- 上传文件的modal -->
-    <comEamItemImageUploadFile ref="comEamItemImageUploadFile" @refreshPageTables="getInspectionFormData()" v-drag></comEamItemImageUploadFile>
+    <comEamItemImageUploadFile ref="comEamItemImageUploadFile" @refreshPageTables="getInspectionFormData" v-drag></comEamItemImageUploadFile>
   </div>
 </template>
 
@@ -456,12 +451,6 @@
         handler: function (newV, oldV) {
           this.saveData.workTime = Math.ceil(Math.floor(this.dayjs(this.saveData.endDate).diff(this.saveData.startDate, 'seconds') / 30) / 2)
         }
-      },
-      searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.groupID = this.searchData.groupID.toUpperCase()
-        }
       }
     },
     data () {
@@ -499,7 +488,6 @@
         pageSize: 50,
         totalPage: 0,
         dataList: [],
-        dataListLoading: false,
         dataListSelections: [],
         modalFlag: false,
         modalDisableFlag: false,
@@ -1221,6 +1209,29 @@
     },
 
     methods: {
+      // 实测值内容改变事件
+      changeValue (row) {
+        if (row.minValue == null && row.maxValue != null) {
+          if (row.numberValue > row.maxValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        } else if (row.maxValue == null && row.minValue != null) {
+          if (row.numberValue < row.minValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        } else if (row.minValue != null && row.maxValue != null) {
+          if (row.numberValue < row.minValue || row.numberValue > row.maxValue) {
+            row.itemResult = '不合格'
+          } else {
+            row.itemResult = '合格'
+          }
+        }
+      },
+
       // 取消小键盘
       cancelKeyboard (e) {
         // this.$refs.objectID
@@ -1350,7 +1361,6 @@
 
       // 获取数据列表
       getRoleNameList () {
-        this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
@@ -1361,12 +1371,9 @@
         }).then(({data}) => {
           if (data && data.code === 0) {
             this.roleList = data.page.list
-            this.totalPage = data.page.totalCount
           } else {
             this.roleList = []
-            this.totalPage = 0
           }
-          this.dataListLoading = false
         })
       },
 
@@ -1539,7 +1546,6 @@
             this.pageSize = data.page.pageSize
             this.totalPage = data.page.totalCount
           }
-          this.dataListLoading = false
         })
       },