From fdfc2c66434bdacdd539f228b51a33c8d15e71d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 20 四月 2024 12:32:15 +0800
Subject: [PATCH] #

---
 pages/mat/matQuery.vue |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index fcd0df3..7ae5f5a 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -2,7 +2,7 @@
 	<view>
 		<!-- 鎼滅储妗� -->
 		<view class="search-bar">
-			<uni-search-bar placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+			<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
 		</view>
 		<scroll-view>
 			<view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
-				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
+				<view class="tag-item" style="word-break: break-all;width: 90%;">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
 				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
 			</view>
 		</view>
@@ -36,6 +36,7 @@
 			return {
 				tagList: [],
 				matList: [],
+				condition: '',
 				reload: false,
 				curr:1,
 				tag: '鍒嗙被',
@@ -55,7 +56,9 @@
 		},
 		onReachBottom() {
 			this.status = 'more';
-			this.showMat(this.tagIdNow);
+			if (this.tagList == null) {
+				this.showMat(this.tagIdNow);
+			}
 		},
 		onLoad() {
 			// 娌″暐鐢ㄤ簡
@@ -71,10 +74,40 @@
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.showTag(1)
+			this.showTag(10009)
 		},
 		methods: {
 			search() {
+				let that = this
+				that.tagList = []
+				that.matList = []
+				uni.request({
+				    url: that.baseUrl + '/mat/search/pda/auth',
+				    data: {
+						condition: that.condition
+				    },
+					method:"GET",
+				    header: {
+						'token':uni.getStorageSync('token'),
+				    },
+					success(result) {
+						console.log(result);
+						var res = result.data
+						if (res.code === 200 ) {
+							that.matList = res.data
+							// that.save()
+						} 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
@@ -91,6 +124,7 @@
 						'token':uni.getStorageSync('token'),
 					},
 					success(result) {
+						console.log(result);
 						that.tagList = null
 						that.matList = []
 						var res = result.data
@@ -98,6 +132,7 @@
 							if (res.data != null && res.data.length > 0) {
 								that.tagList = res.data
 							} else {
+								that.tagList = []
 								that.showMat(parentId)
 							}
 						} else if (res.code === 403 ) {
@@ -131,6 +166,7 @@
 						'token':uni.getStorageSync('token'),
 				    },
 					success(result) {
+						console.log(result);
 						that.tagList = null
 						var res = result.data
 						if (res.code === 200) {

--
Gitblit v1.9.1