From ab38e495c17246a60d04dc67fc50c9fde1b2fcae Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 29 Dec 2023 17:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/record/recordFilter.vue      | 14 +++++++++-----
 pages/purchaseReturn/job/returnDetail.vue |  4 ++--
 pages/transfer/job/issueDetail.vue        |  6 +++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mycomponents/record/recordFilter.vue b/mycomponents/record/recordFilter.vue
index c3112443..710a59b4 100644
--- a/mycomponents/record/recordFilter.vue
+++ b/mycomponents/record/recordFilter.vue
@@ -8,7 +8,7 @@
 						只看当天
 					</view>
 					
-				<u-switch v-model="checkedToday" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
+				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35" @change="switchChangeToday"></u-switch>	
 			</view>
 			<view class="">
 				<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
@@ -36,6 +36,7 @@
 		data() {
 			return {
 				dataContent: {},
+				checkedTodayModel:false,
 			}
 		},
 		props: {
@@ -43,10 +44,6 @@
 				type: Boolean,
 				default: false
 			},
-			checkedWaitTask: {
-				type: Boolean,
-				default: false
-			},
 			otherTitle: {
 				type: String,
 				default: ""
@@ -57,6 +54,13 @@
 			}
 		},
 		watch: {
+			checkedToday: {
+				handler(newName, oldName) {
+					this.checkedTodayModel = this.checkedToday
+				},
+				immediate: true,
+				deep: true
+			},
 		},
 		mounted() {
 			
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 36e7b708..0de659c4 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -239,10 +239,10 @@
 								r.batch == batch && r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index 1e7824f4..bd19fe7c 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -258,13 +258,13 @@
 					} else {
 						var itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
-								r.batch == batch
+								r.batch == batch && r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);