From cdad4619cf504f5fe079d735feea680eee3bf6ed Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 三月 2024 10:17:36 +0800
Subject: [PATCH] #

---
 pages/phyz/order/orderList.vue |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index 4f2d219..3c3ce58 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -56,6 +56,8 @@
 		},
 		onLoad() {
 			let that = this
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
 			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
 			
@@ -63,24 +65,26 @@
 			eventChannel.on('item', function(data) {
 				console.log(data);
 				that.orderId = data.item.orderId 
+				console.log(data.item.id);
 				uni.setNavigationBarTitle({
-					title: data.item.orderNo
+					title: data.item.orderNo,
+					
 				})
+				that.getOrderDetl(data.item.id)
 				
 			})
 		},
 		onShow() {
-			this.baseUrl = uni.getStorageSync('baseUrl');
-			this.token = uni.getStorageSync('token');
 			if (this.dataList.length > 0) {
 				this.oldDataList = [...this.dataList]
 			}
-			this.getOrderDetl(this.orderId)
+			// this.getOrderDetl(this.orderId)
 		},
 		methods: {
 			// 璁㈠崟鏄庣粏
 			getOrderDetl(id) {
 				let _this = this
+				console.log(id);
 				uni.request({
 					url: `${_this.baseUrl}/orderDetl/list/auth`,
 					header: {'token': uni.getStorageSync('token')},
@@ -161,7 +165,27 @@
 				this.dataList = [...this.oldDataList]
 			},
 			combConfirm(type) {
-				
+				let _this = this
+				let combList = []
+				for (let k of _this.dataList) {
+					if (k.checked) {
+						combList.push(k)
+					}
+				}
+				if (combList.length == 0) {
+					uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'
+					})
+					return
+				}
+				uni.navigateTo({
+					url: "../AGV/AGVPakin2",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('mats', {
+							mats: combList
+						})
+					},
+				});
 			},
 		}
 	}

--
Gitblit v1.9.1