From f5d78a980a73592f2497d76e7caec34073cbe558 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 30 Nov 2022 12:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/CustomerLabelPrint.vue  | 13 +++---------
 pages/WarehouseManage/ProdDeliveryConfirm.vue | 21 +++++++++++--------
 pages/WarehouseManage/XuniDelivery.vue        | 19 ++++++++++-------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/pages/WarehouseManage/CustomerLabelPrint.vue b/pages/WarehouseManage/CustomerLabelPrint.vue
index 2ccf92b..88adecb 100644
--- a/pages/WarehouseManage/CustomerLabelPrint.vue
+++ b/pages/WarehouseManage/CustomerLabelPrint.vue
@@ -54,7 +54,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_customerPrint">打印</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled1" @tap="_customerInfo(val1)">查询</button>
+			<button class="submit-button" @tap="_customerInfo(val1)">查询</button>
 		</view>
 	</view>
 </template>
@@ -82,22 +82,15 @@
 			},
 			/** 查询 */
 			async _customerInfo (e) {
-				this.disabled1 = true
 				if (!this.val1) {
 					uni.showToast({
 						title: '请扫木箱码',
 						icon: 'none'
 					})
-					this.disabled1 = false
 					return
 				}
-				try {
-					let res = await customerInfo(e)
-					this.dataList = [...res.data]
-					this.disabled1 = false
-				} catch (e) {
-					this.disabled1 = false
-				}	
+				let res = await customerInfo(e)
+				this.dataList = [...res.data]	
 			},
 			/** 打印 */
 			async _customerPrint () {
diff --git a/pages/WarehouseManage/ProdDeliveryConfirm.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue
index f482f0f..2c03630 100644
--- a/pages/WarehouseManage/ProdDeliveryConfirm.vue
+++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue
@@ -8,7 +8,7 @@
 						<span class="filter_label">木箱</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" 
+						<search-box v-model="val1" @handleChange="handleChange1" 
 						/>
 					</view>
 				</view>
@@ -17,7 +17,7 @@
 						<span class="filter_label">点位</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val2" />
+						<search-box v-model="val2"  @handleChange="handleChange2" />
 					</view>
 				</view>
 			</view>
@@ -52,7 +52,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
-			<button class="submit-button" @tap="_stivtQuery">查询</button>
+			<button class="submit-button" @tap="_stivtQuery(val1, val2)">查询</button>
 		</view>
 	</view>
 </template>
@@ -79,12 +79,15 @@
 		created () {
 		},
 		methods: {
-			handleChange (e) {
-				// console.log(e)
+			handleChange1 (e) {
+				this._stivtQuery(e, this.val2)
+			},
+			handleChange2 (e) {
+				this._stivtQuery(this.val1, e)
 			},
 			/** 初始化查询 */
-			async _stivtQuery () {
-				let res = await stivtQuery(this.val1, this.val2)
+			async _stivtQuery (val1, val2) {
+				let res = await stivtQuery(val1, val2)
 				this.dataList = [...res.data]	
 			},
 			async _stoutConfirm () {
@@ -94,7 +97,7 @@
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
-					this._stivtQuery()
+					this._stivtQuery(this.val1, this.val2)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -114,7 +117,7 @@
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
-					this._stivtQuery()
+					this._stivtQuery(this.val1, this.val2)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/WarehouseManage/XuniDelivery.vue b/pages/WarehouseManage/XuniDelivery.vue
index 2f9397c..6553fdd 100644
--- a/pages/WarehouseManage/XuniDelivery.vue
+++ b/pages/WarehouseManage/XuniDelivery.vue
@@ -8,7 +8,7 @@
 						<span class="filter_label">木箱</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" 
+						<search-box v-model="val1" @handleChange="handleChange1" 
 						/>
 					</view>
 				</view>
@@ -17,7 +17,7 @@
 						<span class="filter_label">单据号</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val2" />
+						<search-box v-model="val2" @handleChange="handleChange2"/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -54,7 +54,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="_virtualbillQuery">查询</button>
+			<button class="submit-button" @tap="_virtualbillQuery(val1, val2)">查询</button>
 		</view>
 	</view>
 </template>
@@ -81,12 +81,15 @@
 			};
 		},
 		created () {
-			this._virtualbillQuery()
+			this._virtualbillQuery(this.val1, this.val2)
 			this._virtualbillType()
 		},
 		methods: {
-			handleChange (e) {
-				// console.log(e)
+			handleChange1 (e) {
+				this._virtualbillQuery(e, this.val2)
+			},
+			handleChange2 (e) {
+				this._virtualbillQuery(this.val1, e)
 			},
 			/** 选择器 */
 			selectChange(e) {
@@ -98,8 +101,8 @@
 				this.options = [...res.data]
 			},
 			/** 初始化查询 */
-			async _virtualbillQuery () {
-				let res = await virtualbillQuery(this.val1, this.val2, this.index)
+			async _virtualbillQuery (val1, val2) {
+				let res = await virtualbillQuery(val1, val2, this.index)
 				this.dataList = [...res.data]
 			},
 			toSure () {