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

---
 pages/phyz/orderOut/orderList.vue |   62 +++++++++++++++++-------------
 1 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/pages/phyz/orderOut/orderList.vue b/pages/phyz/orderOut/orderList.vue
index af909f2..6315f0d 100644
--- a/pages/phyz/orderOut/orderList.vue
+++ b/pages/phyz/orderOut/orderList.vue
@@ -25,28 +25,7 @@
 				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
 			</view> -->
 		</view>
-		<!-- 寮圭獥 -->
-		<view>
-			<uni-popup ref="pakoutPrive" type="dialog">
-				<view class="popup">
-					<!-- 鏍囬 -->
-					<view class="title">璇烽�夋嫨璐ф灦绫诲瀷</view>
-					<view class="popup-item">
-						<view class="dropdown" @click="toggleDropdown()">
-							<input type="text" style="width: 650rpx;" v-model="containerType"  placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
-							<uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
-							<scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
-								<view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
-							</scroll-view>
-						</view>
-					</view>
-					<view class="btn">
-						<view class="btn-left" @click="emptyOutClose">鍙栨秷</view>
-						<view class="btn-right" @click="emptyOutConfirm()">鍑哄簱</view>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
+		
 		<!-- 鍨珮 -->
 		<view style="height: 340rpx;text-align: center;color: #b9b9b9;">
 			- 宸茬粡鍒板簳浜� -
@@ -65,7 +44,8 @@
 				containerType: '',
 				isOpen: true,
 				option: '',
-				selects: []
+				selects: [],
+				orderId: ''
 			}
 		},
 		onShow() {
@@ -77,11 +57,12 @@
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('item', function(data) {
 				console.log(data.item);
-				_this.getLocDetl(data.item.orderNo,data.item.threeCode,data.item.matnr)
+				_this.orderId = data.item.id
+				_this.getLocDetl(data.item.orderNo,data.item.threeCode,data.item.matnr,data.item.id)
 			})
 		},
 		methods: {
-			getLocDetl(orderNo,threeCode,matnr) {
+			getLocDetl(orderNo,threeCode,matnr,id) {
 				let _this = this
 				uni.request({
 					url: `${_this.baseUrl}/agvMobile/query/locDetl/v1`,
@@ -104,14 +85,36 @@
 								} else {
 									k['color'] = 'order-sts-end'
 								}
+								k['id'] = id
 							}
 							_this.dataList = res.data
+						} 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' })
 						}
 					}
 				})
 			},
-			pakoutPrive() {
-				this.$refs.pakoutPrive.open()
+			pakoutPrive(item) {
+				let _this = this
+				console.log(item);
+				uni.navigateTo({
+					url: "./orderCheck",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('mat', {
+							mat: item,
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							// _this.matnr = data.data
+						},
+					},
+				});
 			},
 			pakout(item) {
 				let _this = this
@@ -126,6 +129,11 @@
 						console.log(res);
 						if (res.code === 200) {
 							
+						} 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' })
 						}
 					}
 				})

--
Gitblit v1.9.1