From eff18a1524881630309f4c38e19a27c98ad12128 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 02 八月 2024 09:17:59 +0800
Subject: [PATCH] #

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

diff --git a/pages/phyz/orderOut/orderList.vue b/pages/phyz/orderOut/orderList.vue
index 1fe7fad..0e1a776 100644
--- a/pages/phyz/orderOut/orderList.vue
+++ b/pages/phyz/orderOut/orderList.vue
@@ -6,6 +6,7 @@
 				<view>
 					<view class="detl-threeCode">{{orderDetl.threeCode}}</view>
 					<view class="detl-locNo">{{orderDetl.locNo}}</view>
+					<view class="detl-locNo">璐ф灦鐮侊細{{orderDetl.suppCode}}</view>
 				</view>
 				<!-- 涓� -->
 				<view style="display: flex;">
@@ -13,6 +14,7 @@
 						<view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
 						<view>缂栧彿锛歿{orderDetl.matnr}}</view>
 						<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
+						<view>搴撲綅鐘舵�侊細{{orderDetl.locSts$}}</view>
 						<view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
 					</view>
 					<view class="out-btn" @click="pakoutPrive(orderDetl)">
@@ -25,28 +27,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 +46,8 @@
 				containerType: '',
 				isOpen: true,
 				option: '',
-				selects: []
+				selects: [],
+				orderId: ''
 			}
 		},
 		onShow() {
@@ -77,11 +59,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`,
@@ -97,27 +80,37 @@
 						console.log(res);
 						if (res.code === 200) {
 							for (let k of res.data) {
-								if (k.anfme > k.qty && k.qty == 0) {
+								if (k.locSts == "F") {
 									k['color'] = 'order-sts-start'
-								} else if (k.anfme > k.qty && k.qty != 0) {
+								} else if (k.locSts != "F") {
 									k['color'] = 'order-sts-working'
 								} 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(item) {
 				let _this = this
+				if (item.locSts != 'F') {
+					uni.showToast({ title: '褰撳墠搴撲綅涓嶆槸鍦ㄥ簱鐘舵�侊紒', icon: "error", position: 'top' })
+					return
+				}
 				uni.navigateTo({
 					url: "./orderCheck",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-						res.eventChannel.emit('item1', {
-							item: item,
+						res.eventChannel.emit('mat', {
+							mat: item,
 						})
 					},
 					events: {
@@ -141,6 +134,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