From 16b692b3ea44779cd15f730b5376ef12b39a9e13 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 17 四月 2024 15:06:44 +0800 Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs --- pages/phyz/orderOut/orderOutSelect.vue | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pages/phyz/orderOut/orderOutSelect.vue b/pages/phyz/orderOut/orderOutSelect.vue index 124e94a..e3c6708 100644 --- a/pages/phyz/orderOut/orderOutSelect.vue +++ b/pages/phyz/orderOut/orderOutSelect.vue @@ -31,7 +31,7 @@ </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%;" @@ -56,10 +56,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'); @@ -68,13 +69,11 @@ }, methods: { getOrderDetlList(threeCode,orderNo,limit) { + console.log(orderNo); let _this = this _this.mask = true _this.data.three_code = threeCode - if (orderNo != '') { - _this.data['order_no'] = orderNo - } - + _this.data.order_no = orderNo _this.data.limit = limit uni.request({ url: `${_this.baseUrl}/orderDetl/pakout/list/authV3`, @@ -98,7 +97,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 +110,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 +120,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 +144,7 @@ }, events: { acceptDataFromOpenedPage: function(data) { - console.log(data); + _this.getOrderDetlList(this.searchValue1,this.searchValue2,1000) } } }) -- Gitblit v1.9.1