From ad4d41f60d4a44e945c8e55d66bfe23ee8c668f6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 11:10:12 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

---
 pages/phyz/bcp/bcpDbList.vue |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 108 insertions(+), 7 deletions(-)

diff --git a/pages/phyz/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue
index 11993dd..c7a9169 100644
--- a/pages/phyz/bcp/bcpDbList.vue
+++ b/pages/phyz/bcp/bcpDbList.vue
@@ -20,7 +20,7 @@
 			</view>
 		</view>
 		<!-- 鍨珮 -->
-		<view style="height: 360rpx;text-align: center;color: #b9b9b9;">
+		<view style="height: 400rpx;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;">
@@ -49,10 +49,27 @@
 		<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">
+						<view class="btn-right" @click="filterConfirm()">寮�濮嬭皟鎷�</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
-			<button size="mini" @click="unAuto('warn')">鎵嬪姩</button>
-			<button size="mini" type="primary" @click="auto('warn')">鑷姩</button>
+			<button size="mini" @click="isAuto('unAuto')">鎵嬪姩</button>
+			<button size="mini" type="primary" @click="isAuto('auto')">鑷姩</button>
 		</view>
 	</view>
 </template>
@@ -64,6 +81,7 @@
 				baseUrl: '',
 				token: '',
 				dataList: [],
+				dbList: [],
 				count: 0,
 				containerType: '',
 				isOpen: true,
@@ -72,7 +90,10 @@
 				orderId: '',
 				station: '',
 				allCheck: false,
-				allCheckBtnTitle: '鍏ㄩ��'
+				allCheckBtnTitle: '鍏ㄩ��',
+				floorList: ['2妤�','3妤�'],
+				floor: '',
+				moveType: ''
 			}
 		},
 		onShow() {
@@ -99,7 +120,8 @@
 					data: {
 						orderNo: orderNo,
 						threeCode: threeCode ,
-						matnr: matnr
+						matnr: matnr,
+						floor: "F1"
 					},
 					method: 'POST',
 					success(res) {
@@ -233,6 +255,50 @@
 				}
 				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);
+				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/v1/locMove`,
+					header: {'token': uni.getStorageSync('token'),},
+					data: param,
+					method: 'POST',
+					success(res) {
+						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' })
+						} 
+					}
+				})
+				this.$refs.filter.close('bottom')
+			}
 		}
 	}
 </script>
@@ -249,6 +315,17 @@
 		padding: 24rpx;
 		z-index: 999;
 	}
+	/* #ifdef APP-PLUS */
+	.station {
+		position: fixed;
+		top: 0rpx;
+		left: 0;
+		right: 0;
+		font-size: 18px;
+		padding: 24rpx;
+		z-index: 999;
+	}
+	/* #endif */
 	.station-title {
 		font-size: 32px;
 		font-weight: bold;
@@ -315,8 +392,6 @@
 	}
 	.popup-item {
 		position: relative;
-		height: 80rpx;
-		line-height: 80rpx;
 		display: flex;
 		align-items: center;
 		font-size: 14px;
@@ -388,5 +463,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