From a9c5e6472fb609e23d6cfdf6fd7ad10af382a8b1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 19 四月 2024 16:37:59 +0800
Subject: [PATCH] #

---
 pages/phyz/orderOut/orderOutSelect.vue |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pages/phyz/orderOut/orderOutSelect.vue b/pages/phyz/orderOut/orderOutSelect.vue
index 124e94a..61cca98 100644
--- a/pages/phyz/orderOut/orderOutSelect.vue
+++ b/pages/phyz/orderOut/orderOutSelect.vue
@@ -18,6 +18,7 @@
 				<view>缂栧彿锛歿{orderDetl.matnr}}</view>
 				<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
 				<view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
+				<view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
 				<view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</view>
 			</view>
 			<view class="list-right" @click="goToLocDetl(orderDetl)">
@@ -31,8 +32,8 @@
 		</view>
 		
 		<view class="buttom">
-			<view style="width: 150rpx;text-align: center;">
-				涓诲崟鍙�
+			<view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
+				鍚嶇О
 			</view>
 			<uni-search-bar v-model="searchValue2" style="width: 100%;"
 				maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
@@ -56,10 +57,11 @@
 					curr: 1,
 					limit: 100,
 					three_code: '',
+					order_no: ''
 				},
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.searchValue1 = uni.getStorageSync('threeCodeOut1');
@@ -67,14 +69,12 @@
 			this.getOrderDetlList(this.searchValue1,this.searchValue2,30)
 		},
 		methods: {
-			getOrderDetlList(threeCode,orderNo,limit) {
+			getOrderDetlList(threeCode,maktx,limit) {
+				uni.showLoading({})
 				let _this = this
 				_this.mask = true
 				_this.data.three_code = threeCode
-				if (orderNo != '') {
-					_this.data['order_no'] = orderNo
-				}
-				
+				_this.data.maktx = maktx
 				_this.data.limit = limit
 				uni.request({
 					url: `${_this.baseUrl}/orderDetl/pakout/list/authV3`,
@@ -82,6 +82,7 @@
 					data: _this.data,
 					method: 'GET',
 					success(res) {
+						uni.hideLoading({})
 						res = res.data
 						if (res.code === 200) {
 							for (let k of res.data.records) {
@@ -98,7 +99,7 @@
 							_this.mask = false
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
-							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
@@ -111,7 +112,7 @@
 				if (this.searchValue1.length == 0) {
 					this.getOrderDetlList(this.searchValue1,this.searchValue2,30)
 				} else {
-					this.getOrderDetlList(this.searchValue1,this.searchValue2,999999)
+					this.getOrderDetlList(this.searchValue1,this.searchValue2,1000)
 				}
 				
 			},
@@ -121,13 +122,18 @@
 				if (this.searchValue1.length == 0) {
 					this.getOrderDetlList(this.searchValue1,this.searchValue2,30)
 				} else {
-					this.getOrderDetlList(this.searchValue1,this.searchValue2,999999)
+					this.getOrderDetlList(this.searchValue1,this.searchValue2,1000)
 				}
-				
+			},
+			clear() {
+				this.searchValue2 = ''
+				this.getOrderDetlList('',this.searchValue1,999999)
 			},
 			clear2() {
-				this.searchValue2 = ''
-				this.getOrderDetlList(this.searchValue1,'',999999)
+				setTimeout(()=> {
+					this.searchValue2 = ''
+					this.getOrderDetlList(this.searchValue1,'',999999)
+				},300)
 			},
 			goToLocDetl(item) {
 				let _this = this
@@ -140,7 +146,7 @@
 					},
 					events: {
 						acceptDataFromOpenedPage: function(data) {
-							console.log(data);
+							_this.getOrderDetlList(this.searchValue1,this.searchValue2,1000)
 						}
 					}
 				})

--
Gitblit v1.9.1