From eb9685ff6a13b46e1102fdbd7d7d3e577b8d4fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 29 Oct 2024 10:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E6=B6=88=E5=A4=B1=202024/8/9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/coms/comScanPackagePack.vue | 25 ++++++-------------
 .../repleinsh/coms/comScanReplishPack.vue     |  1 +
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index f274f6dc..8caed75c 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -113,7 +113,7 @@ const getScanResult = (result) => {
   const item = toLocation.value.Items.find((r) => r.itemCode == itemCode)
   if (item == undefined) {
     showErrorMessage(`未查找到物料【${itemCode}】的翻包明细`, (res) => {
-      getfocus()
+      packGetFocus()
     })
   } else {
     afterGetBalance(result.label, balance, packageInfo)
@@ -136,7 +136,7 @@ const onScan = (result) => {
     const item = toLocation.value.Items.find((r) => r.itemCode == itemCode)
     if (item == undefined) {
       showErrorMessage(`未查找到物料【${itemCode}】的发料明细`, (res) => {
-        getfocus()
+        packGetFocus()
       })
       return
     }
@@ -194,7 +194,7 @@ const afterGetBalance = (label, balance, packageInfo) => {
                 addRecord(batch, label, balance, packageInfo)
               } else {
                 showErrorMessage(`未查找到该箱码【${packingCode}】的明细`, (res) => {
-                  getfocus()
+                  packGetFocus()
                 })
               }
             }
@@ -219,17 +219,17 @@ const afterGetBalance = (label, balance, packageInfo) => {
         })
       } else {
         showErrorMessage(`未查找到批次【${lot}】的翻包明细`, (res) => {
-          getfocus()
+          packGetFocus()
         })
       }
     } else {
       showErrorMessage(`未查找到推荐库位【${fromLocationCode.value}】的翻包明细`, (res) => {
-        getfocus()
+        packGetFocus()
       })
     }
   } catch (e) {
     showErrorMessage(e.stack, (res) => {
-      getfocus()
+      packGetFocus()
     })
   }
 }
@@ -278,19 +278,8 @@ const addRecord = (batch, label, balance, packageInfo) => {
   const record = creatRecord(label, balance, packageInfo)
   batch.Records.push(record)
   calcBatchHandleQty(batch)
-  getfocus()
+  packGetFocus()
 }
-// const getfocus = () => {
-//   if (scanPopup.value) {
-//     scanPopup.value.getfocus()
-//   }
-// }
-//
-// const losefocus = () => {
-//   if (scanPopup.value) {
-//     scanPopup.value.losefocus()
-//   }
-// }
 
 const swipeClick = (params, item) => {
   const { text } = scanOptions.value[params[1]]
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 037b24b2..55da4ad0 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -258,6 +258,7 @@ const getToLocationBalance = (result)=> {
     }
     // callback(res.data)
   }).catch(err => {
+    uni.hideLoading()
     showErrorMessage(err.message);
   })
 }