修改

pages/entry/check-to-store.vue

@@ -9,7 +9,7 @@
 						<span class="filter_label">载具编码</span>
 					</view>
 					<view class="zd-col-17">
-						<search-box v-model="vehicleCode" @handleChange="handleChange"/>
+						<search-box v-model="vehicleCode" @handleChange="handleChange" @handleDel="toEmpty"/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -174,6 +174,9 @@
 			toEmpty () {
 				this.currentData = {}
 				this.vehicleCode = ''
+				this.sWeight = null
+				this.pcsn = null
+				this.qty = null
 				this.storCode = null
 				this.disabled = false
 			},

pages/outbound/stock-list.vue

@@ -20,6 +20,14 @@
 						<input type="text" class="filter_input" v-model="val1">
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">仓位编码</span>
@@ -36,14 +44,6 @@
 						<input type="text" class="filter_input" v-model="val2">
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<input type="text" class="filter_input" v-model="val3">
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">

pages/pick/pick-task.vue

@@ -62,6 +62,7 @@
 					<view class="zd-col-14">
 						<search-box
 						v-model="val2"
+						@handleChange="handleChange2"
 						/>
 					</view>
 				</view>
@@ -90,6 +91,7 @@
 					<view class="zd-col-14">
 						<search-box
 						v-model="val3"
+						@handleChange="handleChange3"
 						/>
 					</view>
 				</view>
@@ -97,7 +99,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="toSure">拣选确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3 || (val2 === val3)}" :disabled="disabled" @tap="toSure">拣选确认</button>
 		</view>
 		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop-line"></view>
@@ -155,6 +157,24 @@
 			handleChange (e) {
 				this._queryPick(e)
 			},
+			handleChange2 (e) {
+				if (this.val3 && e === this.val3) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					this.val3 = ''
+				}
+			},
+			handleChange3 (e) {
+				if (this.val2 && e === this.val2) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					this.val2 = ''
+				}
+			},
 			async _queryPick (e) {
 				let res = await queryPick('Picking', e)
 				this.data = res
@@ -179,6 +199,13 @@
 				if (!this.val1|| !this.val2 || !this.val3) {
 					return
 				}
+				if (this.val2 === this.val3) {
+					uni.showToast({
+						title: '出库和入库料箱不能相同',
+						icon: 'none'
+					})
+					return
+				}
 				this.show = true
 			},
 			toConfirm () {