From 684a71888842924e8e954a12f10ee364f627e8a0 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 26 九月 2023 16:07:18 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index d12a626..6ab18b6 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -75,7 +75,7 @@
 						<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
 						<view><text style="width: 400rpx;">鍏ュ簱鍖哄煙锛歿{item.matType$}}</text></view>
 						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
-						<view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
+						<view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.owner}}</text></view>
 						<view>
 							<text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
 							<text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
@@ -152,7 +152,7 @@
 		data() {
 			return {
 				commonUrl:null,
-				barcode: '',
+				barcode: '80009991',
 				barcodeFocus:true,
 				focus:false,
 				type: 'center',
@@ -175,6 +175,7 @@
 				ck1: false,
 				ck2: true,
 				frozen: 0,
+				owner: ''
 			}
 		},
 		onShow() {
@@ -309,6 +310,14 @@
 						return;
 					}
 				}
+				// 瀹㈡埛淇℃伅涓枃杞暟瀛�
+				for (let k in that.matList) {
+					for (let t in that.owner) {
+						if (that.matList[k].owner == that.owner[t].owner) {
+							that.matList[k].owner = that.owner[t].id
+						}
+					}
+				}
 				uni.showLoading();
 				uni.request({
 				    url: that.commonUrl + '/mobile/comb/auth',
@@ -342,6 +351,13 @@
 								});
 							}, 1000);
 						} else {
+							for (let k in that.matList) {
+								for (let t in that.owner) {
+									if (that.matList[k].owner == that.owner[t].id) {
+										that.matList[k].owner = that.owner[t].owner
+									}
+								}
+							}
 							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
 					}
@@ -390,12 +406,15 @@
 								    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								    matList: function(data) {
 										that.checkMat(data.data)
-										// that.matList.push(data.data)
+									},
+									owner: function(data) {
+										that.owner = data.data
 									},
 								},
 								success: function(res) {
 									// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
 									res.eventChannel.emit('matData', { data: that.matData })
+									res.eventChannel.emit('url', { data: that.commonUrl })
 								},
 							});
 						} else if (res.code == 403) {

--
Gitblit v1.9.1