From 2b5bf2b63f6b8718a396f16f02c682f635744425 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期五, 18 十月 2024 10:56:17 +0800 Subject: [PATCH] 再次拣料-销售单号空格过滤 --- pages/phyz/bcp/bcpDbList.vue | 191 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 183 insertions(+), 8 deletions(-) diff --git a/pages/phyz/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue index 6ebfc59..7aef247 100644 --- a/pages/phyz/bcp/bcpDbList.vue +++ b/pages/phyz/bcp/bcpDbList.vue @@ -1,10 +1,10 @@ <template> - <view> + <view style="font-size: 13px;"> <view class="station station-wrk" v-if="station"> <view class="mt-flex"> <view class="station-title" style="flex: 4;">{{station.threeCode}}</view> <view class="station-title" style="flex: 1;"> - <button size="mini" @click="reloadStation()">鍏ㄩ��</button> + <button size="mini" @click="allChecked()">{{allCheckBtnTitle}}</button> </view> </view> <view>璋冩嫧鍗曞彿锛歿{station.orderNo}}</view> @@ -19,6 +19,9 @@ <view style="flex: 3;">褰撳墠閫夋嫨璋冩嫧鏁伴噺锛歿{station.count ? station.count : 0}}</view> </view> </view> + <!-- 鍨珮 --> + <!-- <view style="height: 330rpx;text-align: center;color: #b9b9b9;"> + </view> --> <view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index"> <view class="list-left" style="display: flex;flex-direction: column;"> <!-- 涓� --> @@ -35,11 +38,38 @@ </view> <!-- 涓� --> </view> + <view class="list-right" @click="checkboxChange(orderDetl)"> + <label > + <checkbox :value="orderDetl.orderNo" :checked="orderDetl.checked" v-show="orderDetl.locSts == 'F'" style="transform:scale(0.7)" /><text></text> + </label> + </view> </view> <!-- 鍨珮 --> - <view style="height: 340rpx;text-align: center;color: #b9b9b9;"> + <view style="height: 160rpx;text-align: center;color: #b9b9b9;"> - 宸茬粡鍒板簳浜� - + </view> + <!-- 閫夋嫨妤煎眰寮圭獥 --> + <view> + <uni-popup ref="filter" type="dialog"> + <view class="filter-popup"> + <!-- 鏍囬 --> + <view class="title">璋冩嫧妤煎眰</view> + <view class="popup-item" style="width: 100%;display: flex;justify-content: center;"> + <view style="margin-top: 50rpx;width: 60%;"> + <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor"></uni-combox> + </view> + </view> + <view class="btn filter-btn"> + <button class="btn-right" @click="filterConfirm()" :disabled="isAutoDis">寮�濮嬭皟鎷�</button> + </view> + </view> + </uni-popup> + </view> + <!-- 搴曢儴鎿嶄綔鎸夐挳 --> + <view class="buttom"> + <button size="mini" @click="isAuto('unAuto')">鎵嬪姩</button> + <button size="mini" type="primary" @click="isAuto('auto')" >鑷姩</button> </view> </view> </template> @@ -51,13 +81,20 @@ baseUrl: '', token: '', dataList: [], + dbList: [], count: 0, containerType: '', isOpen: true, option: '', selects: [], orderId: '', - station: '' + station: '', + allCheck: false, + allCheckBtnTitle: '鍏ㄩ��', + floorList: ['2妤�','3妤�'], + floor: '', + moveType: '', + isAutoDis: false } }, onShow() { @@ -69,6 +106,7 @@ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� eventChannel.on('item', function(data) { console.log(data.item); + data.item['count'] = 0 _this.station = data.item _this.orderId = data.item.id _this.getLocDetl(data.item.orderNo,data.item.threeCode,data.item.matnr,data.item.id) @@ -83,7 +121,8 @@ data: { orderNo: orderNo, threeCode: threeCode , - matnr: matnr + matnr: matnr, + floor: "F1" }, method: 'POST', success(res) { @@ -163,6 +202,114 @@ selected(option) { this.containerType = option }, + checkboxChange(e) { + console.log(e); + let items = this.dataList, + values = e.orderNo; + if (e.checked) { + this.$set(e,'checked',false) + } else { + if (e.locSts != "F") { + this.$set(e,'checked',false) + } else { + this.$set(e,'checked',true) + } + } + let num = 0 + for (let k of items) { + if (k.checked) { + num++ + } + if (num == items.length) { + this.allCheck = true + this.allCheckBtnTitle = '鍙栨秷' + } else { + this.allCheck = false + this.allCheckBtnTitle = '鍏ㄩ��' + } + } + this.upDateCount() + }, + upDateCount() { + let num = 0 + for (let k of this.dataList) { + if (k.checked) { + num = num + k.anfme + } + } + this.station.count = num + }, + allChecked() { + if (this.allCheck) { + this.allCheck = false + this.allCheckBtnTitle = '鍏ㄩ��' + } else { + this.allCheck = true + this.allCheckBtnTitle = '鍙栨秷' + } + for (let item of this.dataList) { + if (this.allCheck) { + // if (item.locSts == "F") + if (item.locSts != "F") { + this.$set(item,'checked',false) + } else { + this.$set(item,'checked',true) + } + } else { + this.$set(item,'checked',false) + } + } + this.upDateCount() + }, + isAuto(type) { + this.dbList = [] + for (let k of this.dataList) { + if (k.checked) { + this.dbList.push(k) + } + } + if (this.dbList.length == 0) { + uni.showToast({ title: '璇烽�夋嫨璋冩嫧搴撲綅', icon: "error", position: 'top' }) + return + } + this.moveType = type + this.$refs.filter.open('bottom') + }, + filterConfirm() { + console.log(this.dbList); + this.isAutoDis = true + if (this.floor == '') { + uni.showToast({ title: '璇烽�夋嫨璋冩嫧妤煎眰', icon: "error", position: 'top' }) + return + } + let _this = this + let param = {floor: this.floor,dbList: this.dbList,moveType: this.moveType} + uni.request({ + url: `${_this.baseUrl}/agvMobile/agv/v2/locMove`, + header: {'token': uni.getStorageSync('token'),}, + data: param, + method: 'POST', + success(res) { + _this.isAutoDis = false + console.log(res); + res = res.data + if (res.code === 200) { + uni.navigateBack({ + delta: 1 + }); + } 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' }) + } + }, + fail(res) { + _this.isAutoDis = false + } + }) + this.$refs.filter.close('bottom') + } } } </script> @@ -171,13 +318,17 @@ @import url('../../../static/css/common/order.css'); .station { + /* position: fixed; */ font-size: 18px; + width: 96%; padding: 24rpx; + z-index: 999; + font-size: 14px; } .station-title { font-size: 32px; font-weight: bold; - padding: 2rpx 0; + /* padding: 2rpx 0; */ } .station-barcode { font-size: 24px; @@ -240,8 +391,6 @@ } .popup-item { position: relative; - height: 80rpx; - line-height: 80rpx; display: flex; align-items: center; font-size: 14px; @@ -313,5 +462,31 @@ font-size: 22px; color: #3a3a3a; } + .filter-popup { + width: 100%; + height: 40vh; + background-color: #FFF; + position: relative; + border-radius: 30rpx 30rpx 0rpx 0rpx; + } + .filter-popup-item { + height: 100%; + width: 100%; + background-color: #c9cdd5; + } + .filter-popup-item-left { + width: 30%; + height: 100%; + background-color: #DCDFE6; + + } + .filter-btn { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + background-color: #FFF; + } + </style> -- Gitblit v1.9.1