From a90cfcb9f363df7087f236b3d5498e562e012851 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 16 Dec 2025 10:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/merge-pallet.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pages/manage/merge-pallet.vue b/pages/manage/merge-pallet.vue
index 53d1651..9a06238 100644
--- a/pages/manage/merge-pallet.vue
+++ b/pages/manage/merge-pallet.vue
@@ -165,9 +165,16 @@
 						}))
 						this.pType = 1
 					} else {
-						this.tPallet = res.vehicle_code
-						this.tPalletData = [...res.materials]
-						this.pType = 0
+						if (res.vehicle_code !== this.val1) {
+							this.tPallet = res.vehicle_code
+							this.tPalletData = [...res.materials]
+							this.pType = 0
+						} else {
+							uni.showToast({
+								title: '原始托盘跟目标托盘不能一致',
+								icon: 'none'
+							})
+						}
 					}
 				} catch (e) {
 					if (this.pType === 0) {
@@ -178,6 +185,7 @@
 						this.tPalletData = []
 					}
 				}
+				this.val1 = ''
 			},
 			toggleSelect(index) {
 				this.$set(this.oPalletData, index, {