From f0e7027e1e27dd3551e56e60a82311f98ccc1b9b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 13 九月 2023 16:43:15 +0800 Subject: [PATCH] # --- pages/mat/matQuery.vue | 8 ++++---- pages/stock/stockCheck.vue | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue index 7f48ff1..4a9aae5 100644 --- a/pages/mat/matQuery.vue +++ b/pages/mat/matQuery.vue @@ -153,7 +153,7 @@ return; } uni.request({ - url: that.baseUrl + '/mat/list/pda/page/auth', + url: that.baseUrl + '/mat/list/pda/auth', data: { curr:that.curr, limit: 20, @@ -167,12 +167,12 @@ that.tagList = null var res = result.data if (res.code === 200) { - if (res.data.records != null && res.data.records.length > 0) { - let list = res.data.records + if (res.data != null && res.data.length > 0) { + let list = res.data that.matList = that.reload ? list : that.matList.concat(list); that.curr = that.curr + 1 } - if (res.data.records.length == 0) { + if (res.data.length == 0) { that.status = 'noMore' } that.baColor = "background-color: #1cbbb4;" diff --git a/pages/stock/stockCheck.vue b/pages/stock/stockCheck.vue index 614db9d..58dbaa5 100644 --- a/pages/stock/stockCheck.vue +++ b/pages/stock/stockCheck.vue @@ -2,8 +2,8 @@ <view> <view class="code"> <view class="item"> - <view class="code-decs">鎵樼洏鐮�:</view> - <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" + <view class="code-decs">鐩樼偣鍗�:</view> + <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="barcodeFocus" @input="search()"> </view> <view class="item"> @@ -37,8 +37,8 @@ <view class="left-item">{{item.maktx}}</view> </view> <view class="list-left-item"> - <view class="desc">瑙勬牸锛�</view> - <view class="left-item">{{item.specs}}</view> + <view class="desc">搴撲綅锛�</view> + <view class="left-item">{{item.locNo}}</view> </view> <view class="list-left-item"> <view class="desc">鎵瑰彿锛�</view> @@ -75,6 +75,10 @@ <input type="text" v-model="matnr" disabled="true" style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;"> </view> + </view> + <view class="popup-item"> + <view class="popup-item-left">搴撲綅:</view> + <view class="popup-item-right"><input type="text" v-model="locNo"></view> </view> <view class="popup-item"> <view class="popup-item-left">鎵瑰彿:</view> @@ -143,7 +147,9 @@ content: '', barcodeFocus: true, matFocus: false, - matData: '' + matData: '', + orderNo:'', + locNo:'' } }, @@ -163,11 +169,11 @@ search() { let that = this uni.request({ - url: that.baseUrl + '/mobile/checkDetl/auth2', + url: that.baseUrl + '/manlocDetl/orderNo', header: { 'token':uni.getStorageSync('token') }, - data: {barcode: that.barcode}, + data: {orderNo: that.orderNo}, method:'GET', success(res) { console.log(res); @@ -325,6 +331,7 @@ this.matnr = this.dataList[i].matnr this.count = this.dataList[i].anfme this.batch = this.dataList[i].batch + this.locNo = this.dataList[i].locNo this.rowNum = i this.eject() }, @@ -352,6 +359,7 @@ reviseConfirm() { this.dataList[this.rowNum].anfme = this.count this.dataList[this.rowNum].batch = this.batch + this.dataList[this.rowNum].locNo = this.locNo this.messageText = "淇敼鎴愬姛" this.messageToggle('success') this.$refs.revise.close() @@ -398,7 +406,7 @@ let that = this var combMats = [] var combParam = {} - combParam['barcode'] = that.barcode + combParam['orderNo'] = that.orderNo combParam['wrkDetls'] = that.dataList uni.request({ url: that.baseUrl + '/mobile/adjustNew/auth', -- Gitblit v1.9.1