From 13f8395529db227867558f68cc7268a2e7fbef63 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Aug 2022 13:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=BB=93=E6=9E=9C=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=A3=80=E6=B5=8B=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/inspection/ResultEntry.vue | 58 ++++++++++++++-------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 196ebd0..6cb161f 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -88,7 +88,8 @@
             <tr v-for="e in dataList" :key="e.inspection_item_id">
               <td>{{e.inspection_item_name}}</td>
               <!-- <td><input-number :min="0 + ''"  v-model="e.testing_value"/></td> -->
-              <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value" @focus="handleFocus(e)" @blur="handleBlur(e)"></td>
+              <!-- <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value" @focus="handleFocus(e)" @blur="handleBlur(e)"></td> -->
+              <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value"></td>
               <td>{{e.up_limit_value | numeric(4)}}</td>
               <td>{{e.down_limit_value | numeric(4)}}</td>
             </tr>
@@ -100,6 +101,12 @@
       <button class="btn submit-button" :class="{'btn-disabled': dataList.length === 0}" @click="calculate">计算</button>
       <button class="btn submit-button" :disabled="disabled1" :class="{'btn-disabled': sure === false}" @click="toSure">保存</button>
     </section>
+    <modal
+    :mdShow="mdShow"
+    @closeModalCallback="closeModalCallback"
+    @comfirmCallback="comfirmCallback">
+      检测值全部为空，是否继续？
+    </modal>
   </section>
 </template>
 
@@ -107,13 +114,15 @@
 import NavBar from '@components/NavBar.vue'
 import DropdownMenu from '@components/DropdownMenu.vue'
 import InputNumber from '@components/InputNumber.vue'
+import Modal from '@components/Modal.vue'
 import {queryWorkProducedure, queryInspection, inspectConfirm, updateWorkStatus} from '@config/getData2.js'
 export default {
   name: 'ResultEntry',
   components: {
     NavBar,
     DropdownMenu,
-    InputNumber
+    InputNumber,
+    Modal
   },
   data () {
     return {
@@ -136,7 +145,8 @@ export default {
       disabled: JSON.stringify(this.$store.getters.materObj1) !== '{}',
       disabled1: false,
       device_id: '',
-      sure: false
+      sure: false,
+      mdShow: false
     }
   },
   beforeRouteLeave (to, from, next) {
@@ -179,19 +189,19 @@ export default {
     }
   },
   methods: {
-    handleFocus (e) {
-      e.testing_value = ''
-    },
-    handleBlur (e) {
-      if (e.testing_value === '') {
-        e.testing_value = e.testing_value2
-      }
-      if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) {
-        e.bred = true
-      } else {
-        e.testing_value2 = e.testing_value
-      }
-    },
+    // handleFocus (e) {
+    //   e.testing_value = ''
+    // },
+    // handleBlur (e) {
+    //   if (e.testing_value === '') {
+    //     e.testing_value = e.testing_value2
+    //   }
+    //   if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) {
+    //     e.bred = true
+    //   } else {
+    //     e.testing_value2 = e.testing_value
+    //   }
+    // },
     goIn () {
       if (this.$route.query.url === 'ProcessGrindBall') {
         this.$router.push('/ProcessGrindBall')
@@ -317,9 +327,21 @@ export default {
         this.disabled1 = false
         return
       }
-      if (this.sure) {
-        this._inspectConfirm()
+      if (!this.sure) {
+        return
       }
+      let arr = this.dataList.filter(el => el.testing_value === '')
+      if (arr.length === this.dataList.length) {
+        this.mdShow = true
+        return
+      }
+      this._inspectConfirm()
+    },
+    closeModalCallback () {
+      this.mdShow = false
+    },
+    comfirmCallback () {
+      this._inspectConfirm()
     },
     calculate () {
       let flag = false