From fc8847640c87d685b2d21e15a13bc22631b1ae83 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 23 五月 2023 14:54:53 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue    |   10 ++++++++--
 pages/basics/matQuery.vue |    5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index a707b6d..8f46506 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -65,8 +65,9 @@
 			
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('matData', function(data) {
-			that.matData = data.data
-			that.matData.anfme = that.matData.fullQty
+				that.matData = data.data
+				that.matData.anfme = that.matData.fullQty
+				// that.matData.batch = that.matData.batch
 			})
 			
 			
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index fc4e53c..83e4bdc 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -324,7 +324,13 @@
 				that.matnr = ''
 			},
 			findMat() {
-				let that = this
+				let that = this 
+				let len = that.matnr.length 
+				let bat = ''
+				if (len == 26 || len == 25) {
+					bat = that.matnr.substring(18,22)
+					that.matnr = that.matnr.substring(3,16) + that.matnr.substring(16,17)
+				}
 				for (var i = 0; i < that.matList.length; i++) {
 					if (that.matnr == that.matList[i].matnr) {
 						uni.showToast({title: that.matnr + "褰撳墠鐗╂枡鎻愬彇锛岃鍕块噸澶嶆壂鎻�!", icon: "none",position: 'top'})
@@ -349,7 +355,7 @@
 						if (res.code === 200 && res.data) {
 							that.matData = res.data
 							that.matnr = ''
-							that.matData['batch'] = ''
+							that.matData['batch'] = bat
 							uni.navigateTo({
 								url: "matQuery",
 								events: {

--
Gitblit v1.9.1