From 6edd503bcd59fae1436a36db6d46f040d8577c33 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 09:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B4=A7=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=A0=87=E7=AD=BE=202024/8/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue | 1 +
 src/pages/deliver/record/deliverRecord.vue    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index 06282d22..ab915a98 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -135,6 +135,7 @@ const openScanPopup = (content, jobcontent) => {
   }, 500)
 }
 const closeScanPopup = () => {
+  losefocus()
   show.value = false
   emit('closeScan')
   // 清除数据，恢复默认值
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index 34657b9b..52fe2d98 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -39,7 +39,7 @@
       <win-scan-button @goScan="openScanPopup"></win-scan-button>
     </view>
 
-    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" headerType="HMQ"></win-scan-pack-and-location>
+    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" headerType="HPQ,HMQ"></win-scan-pack-and-location>
     <com-message ref="comMessageRef" />
     <win-scan-location ref="scanLocationCodeRef" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
   </view>