From b3bcedf5d448a42e4e9542f9bfcb3314a080ccc0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 20 Nov 2024 13:59:38 +0800
Subject: [PATCH] =?UTF-8?q?YT-1076=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=EF=BC=8C=E6=A0=87?=
 =?UTF-8?q?=E5=8C=85=E9=87=8F=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/comRecommendDetailCard.vue            | 16 +++++++++++-----
 src/pages/unPlanned/job/receiptJobDetail.vue     | 11 +++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index ea32ef9b..2e1c29b3 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -38,7 +38,10 @@
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :queryBalance="queryBalance" @confirm="confirm"></balance-qty-edit>
+		<!-- <balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :queryBalance="queryBalance" @confirm="confirm"></balance-qty-edit> -->
+		
+		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty="editItem.qty" @confirm="confirm" :settingParam='settingParam'
+			:isShowStatus="isShowStatus"></recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<comMessage ref="message"></comMessage>
@@ -48,7 +51,8 @@
 <script>
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 	import recommend from '@/mycomponents/recommend/recommend.vue'
-	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	// import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import {
 		getDetailOption,
@@ -60,8 +64,9 @@
 		components: {
 			itemCompareQty,
 			recommend,
-			balanceQtyEdit,
-			winScanLocation
+			// balanceQtyEdit,
+			winScanLocation,
+			recommendQtyEdit
 		},
 		props: {
 			dataContent: {
@@ -159,7 +164,8 @@
 			},
 			edit(item) {
 				this.editItem = item;
-				this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
+				// this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
+				this.$refs.recommendQtyEdit.openTaskEditPopup(item.qty,item.handleQty,item.labelQty);
 			},
 
 			detail(item) {
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 0d5c7806..8b210636 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -290,9 +290,11 @@
 								batch:batch,
 								handleQty:Number(result.label.qty),
 								qty:detail.qty,
-								// toLocationCode:locationCode,
+								toLocationCode:locationCode,
 								// inventoryStatus:inventoryStatus,
 								// toInventoryStatus:inventoryStatus,
+								packQty:Number(result.package.packQty),
+								packUnit:result.package.packUnit,
 								balance:{},
 								isRecommend:false,
 								isNewAdd:"newAdd"
@@ -311,8 +313,13 @@
 								itemDetail.handleQty = Number(result.label.qty);
 								// itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
 								// 	.toLocationCode;
-								itemDetail.packQty = result.package.packQty
+								itemDetail.packQty = Number(result.package.packQty)
+								itemDetail.packUnit = result.package.packUnit
 								itemDetail.labelQty = Number(result.label.qty);
+								
+								itemDetail.balance={}
+								itemDetail.balance.packQty = Number(result.package.packQty)
+								itemDetail.balance.packUnit = result.package.packUnit
 								this.continueScan()
 							}
 						}