From 3ba05343e1d41a05282295cba7e6ebd666955b40 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:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=EF=BC=8C?=
 =?UTF-8?q?=E6=8B=86=E5=8C=85=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=202024/8?=
 =?UTF-8?q?/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScanBalance.vue     | 13 +++++++++----
 src/pages/fg/fgChange.vue                       |  5 ++++-
 src/pages/package/record/overPackageRecord.vue  |  4 +++-
 src/pages/package/record/splitPackageRecord.vue |  4 +++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 0b86a22a..7a2da014 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -78,6 +78,10 @@ export default {
     verifyCategory: {
       type: Boolean,
       default: false
+    },
+    isCheckLocationBalance: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -92,7 +96,6 @@ export default {
       fromLocation: '',
       fromLocationList: [],
       fromLocationAreaTypeList: [],
-
       toLocationAreaTypeList: [],
       locationOnFocus: false,
       businessType: {},
@@ -124,9 +127,11 @@ export default {
         return;
       }
       this.getItemCodeType(result.package.itemCode, callBack => {
-
-        this.getToLocationBalance(this.resultData)
-
+        if(this.isCheckLocationBalance){
+          this.getToLocationBalance(this.resultData)
+        }else {
+          this.queryBalance(this.resultData)
+        }
         //this.queryBalance(this.resultData)
       })
     },
diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
index 7e019a1e..3153d487 100644
--- a/src/pages/fg/fgChange.vue
+++ b/src/pages/fg/fgChange.vue
@@ -61,7 +61,10 @@
       <win-scan-button @goScan="openScanFgPopup"></win-scan-button>
     </view>
 
-    <win-com-scan-balance ref="scanPopup" @getBalance="getPackScanResult" :bussinessCode="bussinessCode" :verifyCategory="true"> </win-com-scan-balance>
+    <win-com-scan-balance ref="scanPopup" @getBalance="getPackScanResult"
+                          :bussinessCode="bussinessCode" :verifyCategory="true"
+                          :isCheckLocationBalance="false">
+    </win-com-scan-balance>
 
     <win-scan-fg-label ref="scanFgPopup" @getResult="getFgScanResult" title="灯码"></win-scan-fg-label>
     <!-- <win-scan-pack ref="scanPopup" @getResult='getScanResult' title="制品标签" headerType="HMQ"></win-scan-pack> -->
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index ae796fd4..e05f3f9d 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -53,7 +53,9 @@
       </view>
       <win-scan-button @goScan="openScanPopup"></win-scan-button>
     </view>
-    <winComScanBalance ref="scanPopup" @getBalance="getScanResult" bussinessCode="OverPackage"> </winComScanBalance>
+    <winComScanBalance ref="scanPopup" @getBalance="getScanResult"
+                       bussinessCode="OverPackage" :isCheckLocationBalance="false">
+    </winComScanBalance>
     <com-message ref="comMessageRef" />
   </view>
 </template>
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index c9ad3d43..ab6b7b0a 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -32,7 +32,9 @@
       <win-scan-button @goScan="openScanPopup"></win-scan-button>
     </view>
 
-    <winComScanBalance ref="scanPopup" @getBalance="getScanResult" :bussinessCode="typeCode"> </winComScanBalance>
+    <winComScanBalance ref="scanPopup" @getBalance="getScanResult"
+                       :bussinessCode="typeCode" :isCheckLocationBalance="false">
+    </winComScanBalance>
     <comMessage ref="comMessage"></comMessage>
   </view>
 </template>