From 6c9cbdf482ce1330704dc635c510ec51a1115a9f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 16:52:29 +0800
Subject: [PATCH] #

---
 pages/basics/order.vue       |    4 +++-
 pages/basics/orderSelect.vue |    8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 80f81af..4dfe3c0 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -188,7 +188,9 @@
 					events: {
 					    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 					    acceptDataFromOpenedPage: function(data) {
-							that.matData = data.data
+							console.log(data.data);
+							that.matData = data.data.item
+							that.orderNo = data.data.orderNo
 							setTimeout(()=> {
 								that.findMat1()
 							},100)
diff --git a/pages/basics/orderSelect.vue b/pages/basics/orderSelect.vue
index 16a30c4..9914ff8 100644
--- a/pages/basics/orderSelect.vue
+++ b/pages/basics/orderSelect.vue
@@ -49,6 +49,7 @@
 				condition:null,
 				tag: [],
 				data: [],
+				orderNo: ''
 			}
 		},
 		onLoad() {
@@ -165,6 +166,7 @@
 						if (res.code === 200) {
 							if (res.data != null && res.data[0].combMats.length > 0) {
 								that.data = res.data[0].combMats
+								that.orderNo = res.data[0].orderNo
 							} else {
 								that.showMat(parentId)
 							}
@@ -227,7 +229,11 @@
 			},
 			findBySelect(item) {
 				console.log(item);
-				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: item});
+				let newItem = {
+					orderNo: this.orderNo,
+					item: item
+				}
+				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: newItem});
 				uni.vibrateShort();
 				uni.navigateBack({
 					

--
Gitblit v1.9.1