From 6332aba37af20b12b8c3c768ac1416f7e1a5fa8c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:52:36 +0800
Subject: [PATCH] #

---
 pages/basics/matSelect.vue |   56 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/pages/basics/matSelect.vue b/pages/basics/matSelect.vue
index beef27d..927d569 100644
--- a/pages/basics/matSelect.vue
+++ b/pages/basics/matSelect.vue
@@ -27,10 +27,12 @@
 					@click="findBySelect(item.matnr)">
 					<view class="demo-list-right">
 						<view class="tag">
-							<view class="cu-tag bg-cyan ">鍟嗗搧</view>
+							<view class="cu-tag bg-cyan "><strong>鍟嗗搧</strong></view>
 						</view>
-						<view class="matnr"><text style="width: 400rpx;">{{item.matnr}}</text></view>
-						<view class="matnr"><text style="width: 400rpx;">{{item.maktx}}</text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;"><strong>鍝佸悕:{{item.maktx}}</strong></text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;"><strong>鍝佸彿:{{item.matnr}}</strong></text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;"><strong>瑙勬牸:{{item.specs}}</strong></text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;"><strong>宸ュ簭:{{item.sku}}</strong></text></view>
 					</view>
 				</label>
 			</checkbox-group>
@@ -42,13 +44,10 @@
 	export default {
 		data() {
 			return {
+				commonUrl:null,
 				condition:null,
 				tag: [],
 				data: [],
-				baseHttp:'http://',
-				baseIP:'',
-				basePORT:'',
-				baseUrl:'/jkwms'
 			}
 		},
 		onLoad() {
@@ -57,9 +56,8 @@
 			const eventChannel = this.getOpenerEventChannel();
 			
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('acceptDataFromOpenerPage', function(data) {
-				that.baseIP = data.baseIP
-				that.basePORT = data.basePORT
+			eventChannel.on('commonUrl', function(data) {
+				that.commonUrl = data.commonUrl
 				that.showTag(1)
 			})
 		},
@@ -81,7 +79,7 @@
 				});
 				uni.request({
 					// url: "http://localhost:8081/jkwms/tag/list/pda/auth",
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/search/pda/auth',
+				    url: that.commonUrl + '/mat/search/pda/auth',
 				    data: {
 						condition: condition
 				    },
@@ -94,25 +92,36 @@
 						var res = result.data
 						if (res.code === 200 ) {
 							that.data = res.data
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
 					}
 				});
 			},
 			showTag(parentId) {
 				let that = this
-				uni.vibrateShort();
+				uni.showLoading();
 				uni.request({
-					// url: "http://localhost:8081/jkwms/tag/list/pda/auth",
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/tag/list/pda/auth',
+				    url: that.commonUrl + '/tag/list/pda/auth',
+					header: {
+						'token':uni.getStorageSync('token'),
+					},
 				    data: {
 						limit: 100000,
 						parentId: parentId
 				    },
-					method:"GET",
-				    header: {
+					header: {
 						'token':uni.getStorageSync('token'),
-				    },
+					},
 					success(result) {
+						console.log(result)
 						that.tag = null
 						that.data = null
 						var res = result.data
@@ -132,6 +141,7 @@
 						} else {
 							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
+						uni.hideLoading();
 					}
 				});
 			},
@@ -142,8 +152,7 @@
 					return;
 				}
 				uni.request({
-					// url: "http://localhost:8081/jkwms/mat/list/pda/auth",
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/list/pda/auth',
+				    url: that.commonUrl + '/mat/list/pda/auth',
 				    data: {
 						tagId: tagId
 				    },
@@ -152,11 +161,14 @@
 						'token':uni.getStorageSync('token'),
 				    },
 					success(result) {
+						console.log(result)
 						that.tag = null
 						var res = result.data
 						if (res.code === 200) {
 							if (res.data != null && res.data.length > 0) {
+								uni.showLoading();
 								that.data = res.data
+								uni.hideLoading();
 							} else {
 								// that.tagId = parentId
 							}
@@ -170,6 +182,7 @@
 						} else {
 							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
+						
 					}
 				});
 			},
@@ -187,8 +200,7 @@
 
 <style>
 	.matnr {
-		margin-left: 60rpx;
-		margin-top: 20rpx;
+		margin: 10rpx auto 10rpx 60rpx;
 	}
 	.matnr:last-child {
 		margin-top: 0rpx;
@@ -270,7 +282,7 @@
 	}
 	.demo-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 180rpx;
+		height: 260rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}

--
Gitblit v1.9.1