From 71f7476809c4a41074b9e5164751faeb1c0b47e2 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期六, 25 五月 2024 15:05:25 +0800 Subject: [PATCH] # --- pages/phyz/checkLocDetl/checkLocDetl.vue | 87 ++++++++++++++++++++++++++++++++----------- 1 files changed, 65 insertions(+), 22 deletions(-) diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue index e4390fb..3200cb7 100644 --- a/pages/phyz/checkLocDetl/checkLocDetl.vue +++ b/pages/phyz/checkLocDetl/checkLocDetl.vue @@ -1,19 +1,25 @@ <template> <view> - <view style="display: flex;"> - <view class="dropdown"> - <input type="text" style="flex: 1;" v-model="row1" placeholder="璇疯緭鍏ユ帓" @confirm="getLocMastList"> - <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('row1')"></uni-icons> - </view> - <view class="dropdown"> - <input type="text" style="flex: 1;" v-model="bay1" placeholder="璇疯緭鍏ュ垪" @confirm="getLocMastList"> - <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('bay1')"></uni-icons> - </view> - <view class="dropdown"> - <input type="text" style="flex: 1;" v-model="lev1" placeholder="璇疯緭鍏ュ眰" @confirm="getLocMastList"> - <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('lev1')"></uni-icons> + <view class="code"> + <uni-search-bar v-model="searchValue1" + maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clearVal" placeholder="杈撳叆 / 鎵弿 璐ф灦鐮�"> + </uni-search-bar> + <view style="display: flex;padding: 10rpx 20rpx;"> + <view class="dropdown"> + <input type="text" style="flex: 1;" v-model="row1" placeholder="璇疯緭鍏ユ帓" @confirm="getLocMastList('')"> + <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('row1')"></uni-icons> + </view> + <view class="dropdown"> + <input type="text" style="flex: 1;" v-model="bay1" placeholder="璇疯緭鍏ュ垪" @confirm="getLocMastList('')"> + <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('bay1')"></uni-icons> + </view> + <view class="dropdown"> + <input type="text" style="flex: 1;" v-model="lev1" placeholder="璇疯緭鍏ュ眰" @confirm="getLocMastList('')"> + <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('lev1')"></uni-icons> + </view> </view> </view> + <view class="list list-font-color" :class="locMast.color" v-for="(locMast,index) in dataList" :key="index"> <view class="list-left"> @@ -57,6 +63,7 @@ export default { data() { return { + searchValue1: '', baseUrl: '', token: '', barcode: '', @@ -68,10 +75,17 @@ item: '' } }, - onLoad() { + onShow() { this.baseUrl = uni.getStorageSync('baseUrl'); this.token = uni.getStorageSync('token'); + if (uni.getStorageSync('lev1')) { + this.lev1 = uni.getStorageSync('lev1'); + } else { + this.lev1 = 2 + } + this.getLocMastList() + this.barcode = '' }, methods: { clear(e) { @@ -79,26 +93,38 @@ case 'row1': setTimeout(() => { this.row1 = '' - this.getLocMastList() + this.getLocMastList('') }, 100); break; case 'bay1': setTimeout(() => { this.bay1 = '' - this.getLocMastList() + this.getLocMastList('') }, 100); break; case 'lev1': setTimeout(() => { this.lev1 = '' - this.getLocMastList() + this.getLocMastList('') }, 100); break; } }, - getLocMastList() { - let _this = this + clearVal() { + this.getLocMastList('') + }, + searchValueInput1() { + setTimeout(() => { + this.row1 = '' + this.bay1 = '' + this.lev1 = '' + this.getLocMastList(this.searchValue1) + }, 100); + }, + getLocMastList(barcode) { + let _this = this + uni.setStorageSync('lev1', this.lev1); uni.request({ url: `${_this.baseUrl}/agv/locMast/list/auth`, header: {'token': uni.getStorageSync('token')}, @@ -107,12 +133,12 @@ limit: 50, row1: _this.row1, bay1: _this.bay1, - lev1: _this.lev1, + floor: _this.lev1, + barcode: barcode }, method: 'GET', success(res) { res = res.data - console.log(res); if (res.code === 200) { for (let k of res.data.records) { if (k.locSts == 'F') { @@ -129,11 +155,18 @@ k['color'] = 'locSts-X' } else if (k.locSts == 'Q') { k['color'] = 'locSts-Q' + } else if (k.locSts == 'P') { + k['color'] = 'locSts-P' } else if (k.locSts == 'X') { k['color'] = 'locSts-X' } } _this.dataList = res.data.records + } else if (res.code == 403) { + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) + setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000); + } else { + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) } } }) @@ -141,6 +174,10 @@ goToLocDetl(e) { this.locNo = e.locNo this.item = e + if (e.locSts == 'S' || e.locSts == 'R') { + uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' }) + return + } this.$refs.check.open() }, checkClose() { @@ -156,6 +193,7 @@ uni.navigateTo({ url: "./locDetl", success: function(res) { + _this.$refs.check.close() // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑 res.eventChannel.emit('item', { item: param @@ -164,7 +202,8 @@ events: { // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨� acceptDataFromOpenedPage: function(data) { - _this.searchValueFocus = true + _this.$refs.check.close() + _this.getLocMastList() } }, }); @@ -182,10 +221,11 @@ } .list-font-color { color: #fff; - /* background-color: #33bb44; */ + /* background-color: #2299ff; */ } .dropdown { border: 1px solid #a7a7a7; + border-radius: 8rpx; margin: 2px; padding: 6px; } @@ -213,6 +253,9 @@ .locSts-P { background-color: #ffaa00; } + .locSts-Q { + background-color: #47a301; + } .locSts-X { background-color: #767676; } -- Gitblit v1.9.1