From 1ae4309fe4fbc19dcdcaa28b1193a2737299b900 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 11 十月 2024 13:20:33 +0800
Subject: [PATCH] #

---
 pages/order/zlOrderPakin.vue |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index fb75a3a..fb24c9a 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -196,8 +196,8 @@
 				bomCode: '',
 				bomCodeFocus: true,
 				maxAn: 0,
-				ck1: false,
-				ck2: true,
+				ck1: true,
+				ck2: false,
 				fullPlt: 'N',
 				decrees_a: {
 					locNo: '',
@@ -208,10 +208,10 @@
 			}
 		},
 		onLoad() {
-			this.dataList = uni.getStorageSync('zlPakinDataList')
-			if (this.dataList === '') {
-				this.dataList = []
-			}
+			// this.dataList = uni.getStorageSync('zlPakinDataList')
+			// if (this.dataList === '') {
+			// 	this.dataList = []
+			// }
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
@@ -290,7 +290,7 @@
 				}, 100);
 			},
 			// 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
-			checkBom() {
+			checkBom(mat) {
 				let _this = this
 				uni.request({
 					url: _this.baseUrl + '/mobile/pda/decrees/check',
@@ -306,7 +306,8 @@
 						if (res.code === 200) {
 							switch(res.data.status) {
 								case 1:
-									_this.findMat()
+									// _this.findMat()
+									_this.checkMat(mat)
 									break;
 								case 2:
 									// 鐩稿悓鍒朵护璐х墿琛ヨ揣
@@ -396,7 +397,7 @@
 			selectMat() {
 				let that = this
 				uni.navigateTo({
-					url: "../mat/matQuery",
+					url: "../mat/matQueryByOrder",
 					success: function(res) {
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('commonUrl', {
@@ -406,12 +407,10 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							that.matnr = data.data
-							that.checkBom(that.matnr)
+							that.matnr = data.data.matnr
+							that.checkBom(data.data)
 						},
 					},
-
-
 				});
 				that.matnr = ''
 			},
@@ -559,6 +558,7 @@
 							innerAudioContext.play()
 							that.dataList = []
 							uni.setStorageSync('zlPakinDataList', that.dataList);
+							uni.showToast({ title: '缁勬墭鎴愬姛', icon: "success", position: 'top' })
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => {

--
Gitblit v1.9.1