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, {