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 |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/pages/phyz/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue
index 2f3b4a2..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;">
@@ -120,7 +120,8 @@
 					data: {
 						orderNo: orderNo,
 						threeCode: threeCode ,
-						matnr: matnr
+						matnr: matnr,
+						floor: "F1"
 					},
 					method: 'POST',
 					success(res) {
@@ -278,10 +279,22 @@
 				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')
@@ -302,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;

--
Gitblit v1.9.1