From 27f3362fa02500bc571d9afdeb70f73ceb7ac0b8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 三月 2024 13:55:08 +0800
Subject: [PATCH] #
---
pages/mat/matQuery.vue | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 1b69771..127b892 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">鍟嗗搧鍚嶇О锛� {{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,7 +69,6 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('commonUrl', function(data) {
that.commonUrl = data.commonUrl
- that.showTag(1)
})
},
onShow() {
@@ -60,6 +78,36 @@
},
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,13 +124,15 @@
'token':uni.getStorageSync('token'),
},
success(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 ) {
@@ -100,12 +150,15 @@
},
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",
@@ -113,13 +166,19 @@
'token':uni.getStorageSync('token'),
},
success(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;"
+ 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(() => {
@@ -170,11 +229,11 @@
padding: 4rpx 12rpx;
}
.tag-item {
- width: 100%;
min-height: 60rpx;
line-height: 2;
padding-left: 50rpx;
color: #606266;
font-size: 14px;
+ word-wrap: break-word;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1