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 |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/pages/phyz/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue
index 2f3b4a2..7aef247 100644
--- a/pages/phyz/bcp/bcpDbList.vue
+++ b/pages/phyz/bcp/bcpDbList.vue
@@ -1,5 +1,5 @@
 <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>
@@ -20,8 +20,8 @@
 			</view>
 		</view>
 		<!-- 鍨珮 -->
-		<view style="height: 360rpx;text-align: center;color: #b9b9b9;">
-		</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;">
 				<!-- 涓� -->
@@ -40,7 +40,7 @@
 			</view>
 			<view class="list-right" @click="checkboxChange(orderDetl)">
 				<label >
-					<checkbox :value="orderDetl.orderNo" :checked="orderDetl.checked" style="transform:scale(0.7)" /><text></text>
+					<checkbox :value="orderDetl.orderNo" :checked="orderDetl.checked" v-show="orderDetl.locSts == 'F'" style="transform:scale(0.7)" /><text></text>
 				</label>
 			</view>
 		</view>
@@ -61,7 +61,7 @@
 						</view>
 					</view>
 					<view class="btn filter-btn">
-						<view class="btn-right" @click="filterConfirm()">寮�濮嬭皟鎷�</view>
+						<button class="btn-right" @click="filterConfirm()" :disabled="isAutoDis">寮�濮嬭皟鎷�</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -69,7 +69,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="isAuto('unAuto')">鎵嬪姩</button>
-			<button size="mini" type="primary" @click="isAuto('auto')">鑷姩</button>
+			<button size="mini" type="primary" @click="isAuto('auto')" >鑷姩</button>
 		</view>
 	</view>
 </template>
@@ -93,7 +93,8 @@
 				allCheckBtnTitle: '鍏ㄩ��',
 				floorList: ['2妤�','3妤�'],
 				floor: '',
-				moveType: ''
+				moveType: '',
+				isAutoDis: false
 			}
 		},
 		onShow() {
@@ -120,7 +121,8 @@
 					data: {
 						orderNo: orderNo,
 						threeCode: threeCode ,
-						matnr: matnr
+						matnr: matnr,
+						floor: "F1"
 					},
 					method: 'POST',
 					success(res) {
@@ -207,7 +209,11 @@
 				if (e.checked) {
 					this.$set(e,'checked',false)
 				} else {
-					this.$set(e,'checked',true)
+					if (e.locSts != "F") {
+						this.$set(e,'checked',false)
+					} else {
+						this.$set(e,'checked',true)
+					}
 				}
 				let num = 0
 				for (let k of items) {
@@ -243,7 +249,8 @@
 				}
 				for (let item of this.dataList) {
 					if (this.allCheck) {
-						if (item.anfme == item.qty) {
+						// if (item.locSts == "F")
+						if (item.locSts != "F") {
 							this.$set(item,'checked',false)
 						} else {
 							this.$set(item,'checked',true)
@@ -270,6 +277,7 @@
 			},
 			filterConfirm() {
 				console.log(this.dbList);
+				this.isAutoDis = true
 				if (this.floor == '') {
 					uni.showToast({ title: '璇烽�夋嫨璋冩嫧妤煎眰', icon: "error", position: 'top' })
 					return
@@ -277,11 +285,27 @@
 				let _this = this
 				let param = {floor: this.floor,dbList: this.dbList,moveType: this.moveType}
 				uni.request({
-					url: `${_this.baseUrl}/agvMobile/agv/v1/locMove`,
+					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')
@@ -294,13 +318,12 @@
 	@import url('../../../static/css/common/order.css');
 	
 	.station {
-		position: fixed;
-		top: 85rpx;
-		left: 0;
-		right: 0;
+		/* position: fixed; */
 		font-size: 18px;
+		width: 96%;
 		padding: 24rpx;
 		z-index: 999;
+		font-size: 14px;
 	}
 	.station-title {
 		font-size: 32px;

--
Gitblit v1.9.1