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 |   92 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 2525afc..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)">
@@ -14,7 +14,7 @@
 				<view class="tag-item">{{item.name}}</view>
 			</view>
 		</scroll-view>
-		<scroll-view>
+		<view>
 			<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item.matnr)">
 				<view class="tag">
 					<view style="display: flex;">
@@ -22,10 +22,11 @@
 					</view>
 				</view>
 				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
-				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx}}</view>
-				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs}}</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>
-		</scroll-view>
+		</view>
+		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
 	</view>
 </template>
 
@@ -34,15 +35,33 @@
 		data() {
 			return {
 				tagList: [],
-				matList: '',
+				matList: [],
+				condition: '',
+				reload: false,
+				curr:1,
 				tag: '鍒嗙被',
 				baColor: "background-color: #0081ff;",
 				desc: '鍟嗗搧缂栧彿:',
 				baseUrl: '',
-				token: ''
+				token: '',
+				status: 'more',
+				contentText: {
+					contentdown: '涓婃媺鍔犺浇鏇村',
+					contentrefresh: '鍔犺浇涓�',
+					contentnomore: '娌℃湁鏇村'
+				},
+				// 褰撳墠tagId
+				tagIdNow: 1
+			}
+		},
+		onReachBottom() {
+			this.status = 'more';
+			if (this.tagList == null) {
+				this.showMat(this.tagIdNow);
 			}
 		},
 		onLoad() {
+			// 娌″暐鐢ㄤ簡
 			let that = this
 			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
@@ -50,16 +69,45 @@
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('commonUrl', function(data) {
 				that.commonUrl = data.commonUrl
-				that.showTag(1)
 			})
 		},
 		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
@@ -76,14 +124,15 @@
 						'token':uni.getStorageSync('token'),
 					},
 					success(result) {
-						console.log(result)
+						console.log(result);
 						that.tagList = null
-						that.matList = null
+						that.matList = []
 						var res = result.data
 						if (res.code === 200) {
 							if (res.data != null && res.data.length > 0) {
 								that.tagList = res.data
 							} else {
+								that.tagList = []
 								that.showMat(parentId)
 							}
 						} else if (res.code === 403 ) {
@@ -96,18 +145,20 @@
 						} else {
 							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
-						uni.hideLoading();
 					}
 				});
 			},
 			showMat(tagId) {
 				let that = this
+				that.tagIdNow = tagId
 				if (tagId == null || tagId == '' || tagId == undefined) {
 					return;
 				}
 				uni.request({
-				    url: that.baseUrl + '/mat/list/pda/auth',
+				    url: that.baseUrl + '/mat/list/pda/page/auth',
 				    data: {
+						curr:that.curr,
+						limit: 20,
 						tagId: tagId
 				    },
 					method:"GET",
@@ -115,16 +166,19 @@
 						'token':uni.getStorageSync('token'),
 				    },
 					success(result) {
-						console.log(result)
+						console.log(result);
 						that.tagList = null
 						var res = result.data
 						if (res.code === 200) {
-							if (res.data != null && res.data.length > 0) {
-								that.matList = res.data
-								that.baColor = "background-color: #1cbbb4;"
-							} else {
-								// that.tagId = parentId
+							if (res.data.records != null && res.data.records.length > 0) {
+								let list = res.data.records
+								that.matList = that.reload ? list : that.matList.concat(list);
+								that.curr = that.curr + 1
 							}
+							if (res.data.records.length == 0) {
+								that.status = 'noMore'
+							}
+							that.baColor = "background-color: #1cbbb4;"
 						} else if (res.code === 403 ) {
 							uni.showToast({title: res.msg, icon: "none", position: 'top'})
 							setTimeout(() => {

--
Gitblit v1.9.1