From eb03f9bfdc1b3547b1266e44114ea737c7756058 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 18 Nov 2024 17:17:13 +0800
Subject: [PATCH] =?UTF-8?q?YT-1051PDA=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E6=95=B0=E9=87=8F=E6=97=B6=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/package/packageList.vue           | 10 +++++++---
 src/mycomponents/qty/recommendQtyEdit.vue          | 14 ++++++++++++++
 .../coms/comReceiptDetailCardBacth.vue             |  7 +++++--
 src/pages/purchaseReceipt/job/receiptDetail.vue    |  6 +++---
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 445cf283..a7dd05bb 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -33,7 +33,7 @@
 				</uni-collapse-item>
 			</uni-collapse>
 		</view>
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm" :isNumPackTips='isNumPackTips'>
 		</recommend-qty-edit>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -119,7 +119,11 @@
 			isShowPackingNumberProps:{
 				type:Boolean,
 				default:false
-			}
+			},
+			isNumPackTips: {
+				type: Boolean,
+				default: false
+			},
 
 		},
 		watch: {
@@ -172,7 +176,7 @@
 			edit(item) {
 				this.editItem = item;
 				console.log(777,item)
-				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
+				this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty, item.packQty);
 			},
 			collapseChange() {
 				this.$emit("collapseChange");
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index b0168c72..b3c64e0b 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -116,6 +116,11 @@ import { nextTick } from 'vue';
 				type: Boolean,
 				default: true
 			},
+			// 是否提示大于包装信息
+			isNumPackTips: {
+				type: Boolean,
+				default: false
+			},
 			showBalanceQty: {
 				type: Boolean,
 				default: false
@@ -182,6 +187,15 @@ import { nextTick } from 'vue';
 			setValue() {
 				// var recommendQty = Number(this.dataContent.qty);
 				// var labelQty = Number(this.dataContent.record.label.qty);
+				if (this.allQty > parseFloat(this.dataContent.packQty) && this.isNumPackTips) {
+					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于包装数量[' +
+						this.dataContent.packQty +
+						']',
+						res => {
+							this.allQty = this.dataContent.packQty
+						})
+						return
+				} 
 				if (this.allQty > this.labelQty && this.isNumTips) {
 					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' +
 						this.labelQty +
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 830e13cf..2c2a63e1 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -13,7 +13,7 @@
 				</template>
 				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="false"
 					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
-					:isShowFromLocation="false" :isShowPackingNumberProps='true'></package-list>
+					:isShowFromLocation="false" :isShowPackingNumberProps='true'  :isNumPackTips='isNumPackTips'></package-list>
 			</uni-collapse-item>
 		</uni-collapse>
 
@@ -68,7 +68,10 @@
 				type: Object,
 				default: null
 			},
-
+			isNumPackTips: {
+				type: Boolean,
+				default: false
+			},
 
 		},
 		watch: {
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 5e2296a5..06628c3c 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -34,7 +34,7 @@
 						<!-- 管理精度是批次 -->
 						<comReceiptDetailCardBacth ref='comReceiptDetailCardBacthRef' :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'
-							v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'">
+							v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'"  :isNumPackTips='true'>
 						</comReceiptDetailCardBacth>
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" @remove="updateData"
 							@updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' v-else>
@@ -502,13 +502,13 @@
 										 let handleQtySub = calc.sub(parseFloat(batchDetailList[i].qty),parseFloat(packAllHandleQty))
 											let pack = {}
 											pack.packingNumber =packingNumber
-											pack.packQty = result.package.packQty
+											pack.packQty = Number(result.package.packQty);
 											pack.packUnit = result.package.packUnit
 											pack.qty = batchDetailList[i].qty
 											
 											pack.toLocationCode = this.toLocationCode;
 											console.log(999,result.package)
-											pack.labelQty = Number(result.package.packQty);
+											pack.labelQty = Number(result.label.qty);
 											pack.scaned = true;
 											// 当前批次剩余可以扫进的数量大于当前扫描的标签数量的时候直接插入当前的批次
 										if(handleQtySub >= parseFloat(qty)){