From e7b25bc2d6c72cf6862e5f27206963b2404d27f7 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 16 Jul 2024 10:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=A4=96?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unPlanned/coms/comReceiptDetailCard.vue   | 22 ++++++++++++++++---
 src/pages/unPlanned/job/receiptJobDetail.vue  | 13 +++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/pages/unPlanned/coms/comReceiptDetailCard.vue b/src/pages/unPlanned/coms/comReceiptDetailCard.vue
index 3a23d8b7..804ae2be 100644
--- a/src/pages/unPlanned/coms/comReceiptDetailCard.vue
+++ b/src/pages/unPlanned/coms/comReceiptDetailCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" @change="">
+		<uni-collapse ref="collapse1" >
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
 					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :showBalanceQty="false">
@@ -68,9 +68,25 @@
 			},
 		},
 		watch: {
-
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						this.$nextTick(res => {
+							setTimeout(() => {
+								if (this.$refs.collapse1) {
+									this.$refs.collapse1.resize();
+								}
+							}, 500)
+						})
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 
+
+
 		data() {
 			return {
 				showItem: {},
@@ -144,4 +160,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 7394d301..071696b0 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -206,6 +206,7 @@
 
 			updateData() {
 				calcHandleQty(this.detailSource);
+				this.$forceUpdate()
 			},
 
 
@@ -220,19 +221,17 @@
 						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
 
-						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch &&
-							r.fromLocationCode == result.fromLocationCode);
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch 
+							);
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
-								.fromLocationCode + "】不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
-									.fromLocationCode + "】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"已经扫描")
 							} else {
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.label.qty);
-								itemDetail.toLocationCode = this.toLocationCode;
+								itemDetail.toLocationCode = this.toLocationCode? this.toLocationCode:itemDetail.toLocationCode ;
 								itemDetail.packQty = result.package.packQty
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);