From 32526e5bddb7b14328b2467cd18783f480b33f3b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:51:53 +0800
Subject: [PATCH] update合伙人
---
sub_pages/supplier/order-settlement/order-settlement.vue | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 24a2209..6a27d29 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -6,7 +6,8 @@
</view>
<view class="p15" style="min-height: calc(100vh - 160rpx);">
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
- <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
+ <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
+ class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
<view class="title flex">
<view class="title">
@@ -17,6 +18,16 @@
</view>
<view class="line"></view>
<view class="form">
+ <!-- <view class="flex">
+ <view class="form-item flex1">
+ <view class="label">结算对象</view>
+ <view class="value">{{item.userName||''}}</view>
+ </view>
+ <view class="form-item flex1">
+ <view class="label"></view>
+ <view class="value"></view>
+ </view>
+ </view> -->
<view class="flex">
<view class="form-item flex1">
<view class="label">结算单价/均价</view>
@@ -24,42 +35,41 @@
</view>
<view class="form-item flex1">
<view class="label">商品数量</view>
- <view class="value">{{item.flowerNum||0}}</view>
+ <view class="value">{{item.flowerNum||0}}扎</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">订单数量</view>
- <view class="value">{{item.orderNum}}</view>
+ <view class="value">{{item.orderNum}}单</view>
</view>
<view class="form-item">
<view class="label">买家数量</view>
- <view class="value">{{item.customerNum}}</view>
+ <view class="value">{{item.customerNum}}个</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
- <view class="value">{{item.serviceFee}}</view>
+ <view class="value">￥{{item.serviceFee||0}}</view>
</view>
<view class="form-item">
<view class="label">售后理赔</view>
- <view class="value">{{item.salesFee}}</view>
+ <view class="value">￥{{item.salesFee||0}}</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">质检扣款</view>
- <view class="value">{{item.checkFee}}</view>
+ <view class="value">￥{{item.checkFee||0}}</view>
</view>
<view class="form-item">
<view class="label">集货站运费</view>
- <view class="value">{{item.stationFee}}</view>
+ <view class="value">￥{{item.stationFee||0}}</view>
</view>
</view>
</view>
-
- <view class="line"></view>
+ <!-- <view class="line"></view> -->
<view class="form">
<view class="flex">
<view class="form-item">
@@ -83,28 +93,33 @@
</template>
<script>
+import moment from 'moment'
export default {
data() {
return {
tabIndex: 0,
- query:{
- startDateStr:'',
- endDateStr:'',
+ query: {
+ startDateStr: '',
+ endDateStr: '',
}
}
},
onLoad() {
- var currentMonthStr = this.$util.toDate(new Date())
+ var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
this.query.startDateStr = currentMonthStr
- var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
+ var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600000 * 24 *
+ 40).substring(0, 8) + '01').getTime() - 3600000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
-
- this.listApi = '/api/partner/settlement/list'
+ // #ifdef PUB_PARTNER
+ this.listApi = '/api/partner/settlement/list'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ this.listApi = '/api/supplier/settlement/list'
+ // #endif
this.getList()
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -113,28 +128,30 @@
uni.stopPullDownRefresh()
},
methods: {
+ toDetail(item) {
+ uni.navigateTo({
+ url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
+ })
+ },
changeIndex(index) {
if (this.tabIndex !== index) {
this.tabIndex = index
// 刷新 query
- if(index===0){
- var currentMonthStr = this.$util.toDate(new Date())
+ if (index === 0) {
+ var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
this.query.startDateStr = currentMonthStr
- var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
+ // moment().startOf
+ var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() +
+ 3600_000 * 24 * 40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
- }else{
+ } else {
this.query.startDateStr = ''
this.query.endDateStr = ''
}
this.refreshList()
-
+
}
},
- toDetail(item) {
- // uni.navigateTo({
- // url: `/pages/notice/notice?id=${item.id}`
- // })
- }
}
}
</script>
@@ -160,8 +177,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
flex: 1;
@@ -188,6 +205,8 @@
font-size: 24rpx;
color: #000000;
line-height: 34rpx;
+ text-align: center;
+ flex: 1;
}
.value.red {
--
Gitblit v1.9.3