合托

pages/manage/merge-pallet.vue

@@ -165,9 +165,16 @@
 						}))
 						this.pType = 1
 					} else {
-						this.tPallet = res.vehicle_code
+						if (res.vehicle_code !== this.val1) {
-						this.tPalletData = [...res.materials]
+							this.tPallet = res.vehicle_code
-						this.pType = 0
+							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, {