From cc7e454ffe4b22aab41d6a1119e1d1573cbfa8cc Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 5 Jul 2022 17:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/equipment/ScanInStore.vue       |  2 +-
 src/pages/xinrui/equipment/ScanOutStore.vue      |  2 +-
 src/pages/xinrui/equipment/SparePartInstore.vue  |  3 +++
 src/pages/xinrui/equipment/SparePartOutstore.vue |  3 +++
 src/pages/xinrui/equipment/UseReturn.vue         | 10 +++++++++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/pages/xinrui/equipment/ScanInStore.vue b/src/pages/xinrui/equipment/ScanInStore.vue
index dac5f16..c62d332 100644
--- a/src/pages/xinrui/equipment/ScanInStore.vue
+++ b/src/pages/xinrui/equipment/ScanInStore.vue
@@ -99,7 +99,7 @@ export default {
         if (!this.dataList.length) {
           this.dataList.push(res.content)
         } else {
-          if (JSON.stringify(this.dataList).indexOf(JSON.stringify(res.content)) == -1) {
+          if (JSON.stringify(this.dataList).indexOf(JSON.stringify(res.content)) === -1) {
             this.dataList.push(res.content)
           }
         }
diff --git a/src/pages/xinrui/equipment/ScanOutStore.vue b/src/pages/xinrui/equipment/ScanOutStore.vue
index 2587239..068b2af 100644
--- a/src/pages/xinrui/equipment/ScanOutStore.vue
+++ b/src/pages/xinrui/equipment/ScanOutStore.vue
@@ -101,7 +101,7 @@ export default {
         if (!this.dataList.length) {
           this.dataList.push(res.content)
         } else {
-          if (JSON.stringify(this.dataList).indexOf(JSON.stringify(res.content)) == -1) {
+          if (JSON.stringify(this.dataList).indexOf(JSON.stringify(res.content)) === -1) {
             this.dataList.push(res.content)
           }
         }
diff --git a/src/pages/xinrui/equipment/SparePartInstore.vue b/src/pages/xinrui/equipment/SparePartInstore.vue
index 55b1f30..77e46f5 100644
--- a/src/pages/xinrui/equipment/SparePartInstore.vue
+++ b/src/pages/xinrui/equipment/SparePartInstore.vue
@@ -63,6 +63,9 @@ export default {
   created () {
     this._queryIODtl()
   },
+  activated () {
+    this._queryIODtl()
+  },
   methods: {
     /** 1.1出入库单查询 */
     async _queryIODtl () {
diff --git a/src/pages/xinrui/equipment/SparePartOutstore.vue b/src/pages/xinrui/equipment/SparePartOutstore.vue
index 06f134b..7d0bb81 100644
--- a/src/pages/xinrui/equipment/SparePartOutstore.vue
+++ b/src/pages/xinrui/equipment/SparePartOutstore.vue
@@ -65,6 +65,9 @@ export default {
   created () {
     this._queryIODtl()
   },
+  activated () {
+    this._queryIODtl()
+  },
   methods: {
     /** 1.1出入库单查询 */
     async _queryIODtl () {
diff --git a/src/pages/xinrui/equipment/UseReturn.vue b/src/pages/xinrui/equipment/UseReturn.vue
index 472f76e..91ab998 100644
--- a/src/pages/xinrui/equipment/UseReturn.vue
+++ b/src/pages/xinrui/equipment/UseReturn.vue
@@ -45,7 +45,7 @@
       </div>
     </section>
     <section class="submit-bar">
-      <button class="btn submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @click="_confirmReturn">确认入库</button>
+      <button class="btn submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @click="toSure">确认入库</button>
     </section>
   </section>
 </template>
@@ -113,6 +113,14 @@ export default {
       } catch (error) {
         this.disabled1 = false
       }
+    },
+    toSure () {
+      this.disabled1 = true
+      if (!this.dataList.length) {
+        this.disabled1 = false
+        return
+      }
+      this._confirmReturn()
     }
   }
 }