From e4dc67055ea0c21e72815054c044b56a76ec625e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 17 四月 2024 13:08:36 +0800
Subject: [PATCH] #

---
 pages/mat/matQuery.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 57f5626..70d1fac 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)">
@@ -23,7 +23,7 @@
 				</view>
 				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
 				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
-				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
+				<view class="tag-item">鍟嗗搧浜у湴锛� {{item.origin  ? item.origin : '--'}}</view>
 			</view>
 		</view>
 		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -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() {
 			// 娌″暐鐢ㄤ簡
@@ -70,11 +73,40 @@
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
-			this.token = uni.getStorageSync('token');
-			this.showTag(1)
+			this.token = uni.getStorageSync('token');			
+			this.showMat(1)
 		},
 		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) {
+						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
@@ -92,12 +124,13 @@
 					},
 					success(result) {
 						that.tagList = null
-						that.matList = []
+						that.matList = []						
 						var res = result.data
 						if (res.code === 200) {
-							if (res.data != null && res.data.length > 0) {
-								that.tagList = res.data
+							if (res.records != null && res.records.length > 0) {
+								that.tagList = res.data.records
 							} else {
+								that.tagList = []
 								that.showMat(parentId)
 							}
 						} else if (res.code === 403 ) {
@@ -120,10 +153,10 @@
 					return;
 				}
 				uni.request({
-				    url: that.baseUrl + '/mat/list/pda/page/auth',
+				    url: that.baseUrl + '/mat/list/pda/auth',
 				    data: {
 						curr:that.curr,
-						limit: 100,
+						limit: 20,
 						tagId: tagId
 				    },
 					method:"GET",
@@ -132,10 +165,10 @@
 				    },
 					success(result) {
 						that.tagList = null
-						var res = result.data
+						var res = result.data						
 						if (res.code === 200) {
 							if (res.data.records != null && res.data.records.length > 0) {
-								let list = res.data.records
+								let list = res.data.records								
 								that.matList = that.reload ? list : that.matList.concat(list);
 								that.curr = that.curr + 1
 							}

--
Gitblit v1.9.1