From 24fe84795c84c8414525c9cf0b6f75f27d34a2a3 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 19 Aug 2024 11:37:53 +0800
Subject: [PATCH] =?UTF-8?q?HL-5339=E6=97=A0=E8=AE=A1=E5=88=92=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=EF=BC=8C=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5=E6=95=B0?=
 =?UTF-8?q?=E8=BF=98=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=89=AB=E6=8F=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E5=88=B0=E6=8A=A5=E5=B7=A5=E6=95=B0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9B=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8F=AF=E5=86=8D=E6=AC=A1=E6=89=AB=E6=8F=8F=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=9C=A8=E6=89=AB=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/receiptNoPlan.vue | 35 +++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 8bb14470..25cb7dcb 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -395,12 +395,22 @@
 
 			calcFgQty() {
 				this.dataContent.handleQty = this.showList.length;
-				if (this.dataContent.handleQty == this.dataContent.packQty) {
-					if (this.$refs.scanPopup) {
-						this.$refs.scanPopup.closeScanPopup();
+				if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){
+					if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.closeScanPopup();
+						}
+						this.commit()
+					}
+				}else{
+					if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.closeScanPopup();
+						}
+						this.commit()
 					}
-					this.commit()
 				}
+				
 			},
 
 			scanPopupGetFocus() {
@@ -416,15 +426,22 @@
 			getH5BatchPrintingLable( number) {
 				let _this = this
 				batchPrintingLable(number).then(resLable => {
-					console.log('batchPrintingLable', resLable)
 					const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
 					const webData = {
 						token: storage.getStorage(storage.constant.token),
 						asn_number: resLable.data
 					}
-					uni.navigateTo({
-						url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
-					});
+					
+					if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
+						uni.redirectTo({
+							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+						});
+					}else{
+						uni.navigateTo({
+							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+						});
+					}
+					
 				})
 			},			
 
@@ -432,7 +449,7 @@
 				let _this = this
 				// #ifdef APP
 				if (pointData.length > 0) {
-					if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
+					if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
 						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});