Skip to content

W
wly-APP
Commit 3fe467ff authored by chicheng's avatar chicheng
Browse files
Options

票账管理页面调整

parent 95bada66
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 149 deletions
pages/billing-invoice/invoice-query.nvue
View file @ 3fe467ff
...@@ -5,42 +5,37 @@ ...@@ -5,42 +5,37 @@
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image> <image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view> </view>
<view class="main"> <view class="main">
<view class="list-wrapper" :style="scrollHeight"> <scroll-view :style='scrollHeight' class="scroll-area" scroll-y="true" lower-threshold='150'
<list class="list" scrollable loadmoreoffset='1' show-scrollbar='false' @loadmore="scrolltolower"> @scrolltolower='scrolltolower'>
<list class="scroll-area view" loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower">
<cell class="list-cell" v-for="(item,index) in lists" :key="index"> <cell class="list-cell" v-for="(item,index) in lists" :key="index">
<view class="listview">
<view class="cell-list">
<view class="middle view planout-block-item"> <view class="middle view planout-block-item">
<view class="item-block item-block-code"> <view class="text-block">
<text class="item-block-label">开票方编号：{{item.billto_bp}}</text> <text class="middle-date">开票方编号</text>
<text class="middle-date-des">{{item.billto_bp}}</text>
</view> </view>
<view class="item-block item-block-name"> <view class="text-block">
<text class="item-block-label item-block__label">{{item.billto_name}}</text> <text class="middle-date">客户名称</text>
<text class="middle-date-des">{{item.billto_name}}</text>
</view> </view>
<view class="item-block item-block-date"> <view class="text-block">
<text class="detal-item-label">发生日期：{{item.posting_date}}</text> <text class="middle-date">发生日期</text>
<text class="middle-date-des">{{item.posting_date}}</text>
</view> </view>
<view class="text-block">
<view class="block-detal block-detal-last"> <text class="middle-date">货款金额</text>
<view class="block-detal-item"> <text class="middle-date-des">{{item.goods_amount}}</text>
<text class="detal-item-label">货款金额</text>
<text class="detal-item-value">{{item.goods_amount}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">随货保证金</text>
<text class="detal-item-value">{{item.forward_amount}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">经销商保证金</text>
<text class="detal-item-value">{{item.dealing_amount}}</text>
</view> </view>
<view class="text-block">
<text class="middle-date">随货保证金</text>
<text class="middle-date-des">{{item.forward_amount}}</text>
</view> </view>
<view class="text-block text-block-last">
</view> <text class="middle-date">经销商保证金</text>
<text class="middle-date-des">{{item.dealing_amount}}</text>
</view> </view>
</view> </view>
<view class="empty-block"> <view class="empty-block"></view>
</view>
</cell> </cell>
<cell> <cell>
<view class="loading-more" v-if='lists.length>0'> <view class="loading-more" v-if='lists.length>0'>
...@@ -51,7 +46,7 @@ ...@@ -51,7 +46,7 @@
</view> </view>
</cell> </cell>
</list> </list>
</view> </scroll-view>
</view> </view>
</view> </view>
</template> </template>
...@@ -93,7 +88,7 @@ ...@@ -93,7 +88,7 @@
}, },
scrollHeight() { scrollHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height -58}px`, 'height': `${this.sysinfo.safeArea.height - 180 - 44}px`
} }
}, },
...mapState(['sysinfo', 'userInfo', 'userBpData']) ...mapState(['sysinfo', 'userInfo', 'userBpData'])
...@@ -174,98 +169,78 @@ ...@@ -174,98 +169,78 @@
/* #endif */ /* #endif */
.lists { .lists {
flex: 1; position: relative;
background: #F2F3F5; flex-direction: column;
overflow-y: scroll;
background: #f0f4f5;
overflow-x: hidden;
} }
.header-bg { .header-bg {
position: absolute; height: 284rpx;
left: 0; margin-top: -88rpx;
right: 0;
height: 382rpx;
} }
.header-bg-img { .header-bg-img {
width: 750rpx; width: 750rpx;
height: 382rpx;
} }
.main { .main {
flex: 1; position: relative;
padding: 0 32rpx;
margin-top: 100rpx;
}
.list-wrapper {
flex: 1;
}
.list {
flex: 1;
}
.listview {
flex-direction: column; flex-direction: column;
background-color: #FFFFFF; margin-top: -164rpx;
border-radius: 10rpx; padding: 0 16rpx;
margin-bottom: 24rpx;
padding: 24rpx;
} }
.cell-list { .scroll-area {
flex-direction: column; overflow-y: scroll;
} }
.planout-block-item { .view {
flex-direction: column; flex-direction: column;
} }
.item-block { .middle {
flex-direction: row; background-color: #fff;
align-items: center; border-radius: 16rpx;
margin-bottom: 16rpx; padding: 32rpx 64rpx 32rpx 48rpx;
}
.item-block-code {
justify-content: space-between;
}
.item-block-label {
font-size: 28rpx;
color: #333333;
} }
.item-block__label { .text-block {
font-weight: bold; display: flex;
font-size: 32rpx; overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
} }
.item-block-date { .text-block-last {
margin-bottom: 24rpx; margin-bottom: 0;
border-bottom: 0;
} }
.detal-item-label { .middle-date {
font-size: 24rpx; flex: 2;
color: #999999; font-size: 28rpx;
line-height: 96rpx;
color: #333;
} }
.block-detal { .middle-date-des {
flex-direction: row; flex: 3;
background-color: #F8F8F8; font-size: 28rpx;
padding: 24rpx; line-height: 96rpx;
border-radius: 8rpx; height: 96rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #888;
} }
.block-detal-item { .planout-block-item {
flex: 1; flex: 1;
align-items: center; width: 750rpx;
} margin-bottom: 26rpx;
.detal-item-value {
font-size: 28rpx;
color: #333333;
margin-top: 8rpx;
font-weight: bold;
} }
.loading-more { .loading-more {
......
pages/billing-invoice/market-support-query.nvue
View file @ 3fe467ff
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="text-block" v-if="condition.option === 'BT'"> <view class="text-block" v-if="condition.option === 'BT'" key="start-date">
<text class="middle-date">开始日期</text> <text class="middle-date">开始日期</text>
<view class="middle-date-des"> <view class="middle-date-des">
<view class="picker-year"> <view class="picker-year">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="text-block text-block-last" v-if="condition.option === 'BT'"> <view class="text-block text-block-last" v-if="condition.option === 'BT'" key="end-date">
<text class="middle-date">结束日期</text> <text class="middle-date">结束日期</text>
<view class="middle-date-des"> <view class="middle-date-des">
<view class="picker-year"> <view class="picker-year">
...@@ -69,9 +69,7 @@ ...@@ -69,9 +69,7 @@
<text class="btn-text">查询</text> <text class="btn-text">查询</text>
</button> </button>
</view> </view>
<scroll-view :style='scrollHeight' class="scroll-area" scroll-y="true" lower-threshold='150' <list :style='scrollHeight' class="scroll-area view" scrollable loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower">
@scrolltolower='scrolltolower'>
<list class="scroll-area view" loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower">
<cell class="list-cell" v-for="(item,index) in lists" :key='index'> <cell class="list-cell" v-for="(item,index) in lists" :key='index'>
<view class="middle view planout-block-item"> <view class="middle view planout-block-item">
<view class="text-block"> <view class="text-block">
...@@ -99,14 +97,15 @@ ...@@ -99,14 +97,15 @@
</cell> </cell>
<cell> <cell>
<view class="loading-more" v-if='lists.length>0'> <view class="loading-more" v-if='lists.length>0'>
<text class="loading-more-text">-- 到底了 --</text> <text class="loading-more-text" v-if="lists.length >= page.totalCount && page.totalCount > 0">-- 到底了 --</text>
<text class="loading-more-text" v-else-if="isLoading">加载中...</text>
<text class="loading-more-text" v-else>上拉加载更多</text>
</view> </view>
<view class="loading-more" v-else> <view class="loading-more" v-else>
<text class="loading-more-text">暂无数据</text> <text class="loading-more-text">暂无数据</text>
</view> </view>
</cell> </cell>
</list> </list>
</scroll-view>
</view> </view>
</view> </view>
...@@ -129,6 +128,7 @@ ...@@ -129,6 +128,7 @@
loadingText: '加载中...', loadingText: '加载中...',
refreshing: false, refreshing: false,
isOpened: 'none', isOpened: 'none',
isLoading: false, // 添加加载状态，防止重复请求
// 日期查询选项：是、介于、小于等于、大于等于 // 日期查询选项：是、介于、小于等于、大于等于
dateOptions: [ dateOptions: [
{ label: '是', value: 'EQ' }, { label: '是', value: 'EQ' },
...@@ -163,8 +163,11 @@ ...@@ -163,8 +163,11 @@
} }
}, },
scrollHeight() { scrollHeight() {
// 计算滚动区域高度：屏幕高度 - 状态栏和导航栏 - 查询条件区域 - 查询按钮区域
// 查询条件区域大约 300rpx，查询按钮区域大约 120rpx，总共约 420rpx，转换为px约210px
const queryAreaHeight = 210;
return { return {
'height': `${this.sysinfo.safeArea.height - 180 - 44}px`, 'height': `${this.sysinfo.safeArea.height - this.sysinfo.safeArea.top - 44 - queryAreaHeight}px`
} }
}, },
...mapState(['sysinfo', 'userInfo', 'userBpData']) ...mapState(['sysinfo', 'userInfo', 'userBpData'])
...@@ -194,16 +197,28 @@ ...@@ -194,16 +197,28 @@
search() { search() {
this.lists = []; this.lists = [];
this.page.page = 1; this.page.page = 1;
this.page.totalCount = 0; // 重置总数
this.queryData(1); this.queryData(1);
}, },
scrolltolower() { scrolltolower() {
if (this.lists.length >= this.page.totalCount) { // 防止重复请求
if (this.isLoading) {
return;
}
// 判断是否已加载完所有数据
if (this.lists.length >= this.page.totalCount && this.page.totalCount > 0) {
return; return;
} }
this.page.page++; this.page.page++;
this.queryData(this.page.page); this.queryData(this.page.page);
}, },
async queryData(pageNo) { async queryData(pageNo) {
// 防止重复请求
if (this.isLoading) {
return;
}
this.isLoading = true;
// 构建查询条件对象，与PC端格式保持一致 // 构建查询条件对象，与PC端格式保持一致
const allConditions = {} const allConditions = {}
...@@ -254,22 +269,41 @@ ...@@ -254,22 +269,41 @@
...allConditions, ...allConditions,
page: pageNo, page: pageNo,
pagesize: this.page.pagesize, pagesize: this.page.pagesize,
totalCount: this.page.totalCount, totalCount: pageNo === 1 ? 0 : this.page.totalCount, // 第一页时重置totalCount
is_result: 1, is_result: 1,
sort: [] sort: []
} }
try {
if (pageNo === 1) {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
}
const res = await apiGetMarketSupportFee(params); const res = await apiGetMarketSupportFee(params);
if (pageNo === 1) {
uni.hideLoading(); uni.hideLoading();
}
if (res && res.data) { if (res && res.data) {
if (pageNo === 1) { if (pageNo === 1) {
this.lists = res.data || []; this.lists = res.data || [];
} else { } else {
this.lists = this.lists.concat(res.data || []); this.lists = this.lists.concat(res.data || []);
} }
this.page.totalCount = res?.TOTALCOUNT || res?.totalCount || res?.Total || this.page.totalCount; // 更新总数，优先使用后端返回的总数
const totalCount = res?.TOTALCOUNT || res?.totalCount || res?.Total || 0;
if (totalCount > 0) {
this.page.totalCount = totalCount;
}
}
} catch (error) {
console.error('查询失败', error);
if (pageNo === 1) {
uni.hideLoading();
}
} finally {
this.isLoading = false;
} }
} }
} }
...@@ -475,7 +509,7 @@ ...@@ -475,7 +509,7 @@
} }
.scroll-area { .scroll-area {
overflow-y: scroll; flex: 1;
} }
.list-cell { .list-cell {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment