From 12966b4ef9d35b25760fcd4fcdd569bef9aa8547 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 七月 2025 14:10:30 +0800
Subject: [PATCH] #

---
 pages/basics/order.vue |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index dc3a7af..3873330 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -59,6 +59,7 @@
 					<!-- 	<view><text style="width: 400rpx;">鍨嬪彿锛歿{item.model}}</text></view> -->
 						<view><text style="width: 400rpx;">鎵规锛歿{item.batch}}</text></view>
 						<view style="width: 500rpx;"><text>鍨嬪彿锛歿{item.model}}</text></view>
+						<view><text style="width: 400rpx;">搴撳瓨鐘舵�侊細{{item.cstateid$}}</text></view>
 						<!-- <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view> -->
 						<view>
 							<text style="width: 400rpx;">涓绘暟閲忥細{{item.anfme}}</text>
@@ -324,13 +325,17 @@
 						let res = result.data
 						if (res.code === 200 && res.data) {
 							that.matData = res.data
+							
+							let tiaoma = that.matnr;
 							that.matnr = ''
 							uni.navigateTo({
 								url: "matQuery",
 								events: {
 								    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								    matList: function(data) {
-										that.checkMat(data.data)
+										let resultData = data.data;
+										resultData.tiaoma = tiaoma;
+										that.checkMat(resultData)
 										// that.matList.push(data.data)
 									},
 								},
@@ -362,16 +367,17 @@
 			checkMat(mat) {
 				var len = this.matList.length
 				var add = true
-				// for (var i = 0; i < len; i++) {
-				// 	if (mat.matnr == this.matList[i].tiaoma){
-				// 		uni.showToast({title: "鏉$爜閲嶅鎵簡", icon: "none", position: 'top'})
-				// 	}
-				// 	// if (mat.matnr == this.matList[i].matnr&&mat.batch == this.matList[i].batch&&mat.orderNo == this.matList[i].orderNo) {
-				// 	// 	this.matList[i].anfme += mat.anfme 
-				// 	// 	this.$forceUpdate() // 寮哄埗鍒锋柊
-				// 	// 	add = false
-				// 	// }
-				// }
+				for (var i = 0; i < len; i++) {
+					if (mat.tiaoma == this.matList[i].tiaoma){
+						uni.showToast({title: "鏉$爜閲嶅鎵簡", icon: "none", position: 'top'})
+						add = false
+					}
+					// if (mat.matnr == this.matList[i].matnr&&mat.batch == this.matList[i].batch&&mat.orderNo == this.matList[i].orderNo) {
+					// 	this.matList[i].anfme += mat.anfme 
+					// 	this.$forceUpdate() // 寮哄埗鍒锋柊
+					// 	add = false
+					// }
+				}
 				if (add) {
 					this.matList.unshift(mat)
 					

--
Gitblit v1.9.1