From e474ab6cee45627c34a8fc79f2b76c9e82763f2c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 17:44:40 +0800
Subject: [PATCH] update 供应商结算单
---
sub_pages/supplier/order-settlement/order-settlement-detail.vue | 15 +-
sub_pages/supplier/order-settlement/order-settlement.vue | 24 +++-
sub_pages/supplier/order-manage/order-manage-settlement.vue | 153 +++++++++++++++++++++++-------
sub_pages/supplier/order-manage/order-manage-flower.vue | 57 ++++++----
4 files changed, 177 insertions(+), 72 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-flower.vue b/sub_pages/supplier/order-manage/order-manage-flower.vue
index e86eed3..91a3a17 100644
--- a/sub_pages/supplier/order-manage/order-manage-flower.vue
+++ b/sub_pages/supplier/order-manage/order-manage-flower.vue
@@ -1,30 +1,23 @@
<template>
<view class="list-container order-sale supplier">
<view class="p15" style="min-height: calc(100vh - 20rpx);">
+ <u-button @click="()=>{
+ show_time_picker_time = true
+ }" class="w-fit">
+ {{query.day||'-'}}
+ </u-button>
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
<view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
- class="m-b-24 order-sale-list list-container">
+ class="m-t-20 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
- <view class="form">
- <view class="flex">
- <view class="form-item flex1">
- <view class="label">商品名称</view>
- <view class="value">{{item.flowerName||'-'}}</view>
- </view>
- <view class="form-item flex1">
- <view class="label">数量</view>
- <view class="value">{{item.num||0}}</view>
- </view>
+ <view class="flex">
+ <view class="m-r-20" style="min-width: 280rpx;">
+ <view class="title-bold">{{item.flowerName||'-'}}</view>
+ <view class="desc-gray">{{item.flowerLevelStr}}</view>
</view>
- <view class="flex">
- <view class="form-item">
- <view class="label">等级</view>
- <view class="value">{{item.flowerLevelStr}}</view>
- </view>
- <view class="form-item">
- <view class="label">价格</view>
- <view class="value">￥{{item.price||'0.00'}}</view>
- </view>
+ <view class="flex flex1 m-t-12">
+ <view class="flex1 text-center value title-bold">{{item.num||0}}扎</view>
+ <view class="flex1 text-center value">￥{{item.price||'0.00'}}</view>
</view>
</view>
@@ -35,6 +28,9 @@
<!-- 判断是否到底了，自动吧 -->
<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+
+ <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
+ @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="date"></u-datetime-picker>
</view>
</template>
@@ -46,14 +42,17 @@
tabIndex: 0,
query: {
day: ''
- }
+ },
+ show_time_picker_time: false,
+ tmp_picker_time: new Date(),
+
}
},
onLoad(options) {
this.query.day = options.day || ''
-
+ this.page.size = 200
uni.setNavigationBarTitle({
- title:'商品明细-'+this.query.day
+ title: '商品明细-' + this.query.day
})
this.listApi = '/api/supplier/delivery/mine/list/flower'
@@ -69,7 +68,17 @@
uni.stopPullDownRefresh()
},
methods: {
-
+ //选择timer的时间
+ async select_time_picker_time(e) {
+ // console.log('select_time_picker_time1', e, this.tmp_picker_time_item)
+ this.query.day = this.$util.toDate(new Date(e.value))
+ uni.setNavigationBarTitle({
+ title: '商品明细-' + this.query.day
+ })
+ this.show_time_picker_time = false
+ // this.$forceUpdate()
+ this.refreshList()
+ },
}
}
</script>
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index f1de251..c714927 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -1,54 +1,89 @@
<template>
<view class="list-container order-sale supplier">
<view class="p15" style="min-height: calc(100vh - 20rpx);">
+ <u-button @click="()=>{
+ show_time_picker_time = true
+ }" class="w-fit">
+ {{query.day||'-'}}
+ </u-button>
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
+ <view v-if="list&&list.length>0">
+ <view class="flex title-bold tj-money bg-white m-t-12 p10">
+ <view class="m-r-20">待结算：￥{{tj_total-tj_has||0}}</view>
+ <view class="t-red">已结算：￥{{tj_has||0}}</view>
+ </view>
+ </view>
<view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
- class="m-b-24 order-sale-list list-container">
+ class="m-t-20 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
+
+
<view class="form">
- <view class="flex">
- <view class="form-item flex1">
- <view class="label">结算单价/均价</view>
- <view class="value">￥{{item.price||'0.00'}}</view>
+ <view class="flex form-item">
+ <view class="m-r-20 flex" style="min-width: 280rpx;">
+ <view class="title-bold m-r-10">订单状态：{{item.statusBackendStr||'-'}}</view>
</view>
- <view class="form-item flex1">
- <view class="label">商品数量</view>
- <view class="value">{{item.flowerNum||0}}</view>
+ <view class="title-bold m-r-10 m-l-a">结算状态：{{item.statusStr||'未结算'}}</view>
+
+ </view>
+ <view class="flex form-item">
+ <view class="m-r-20 flex" style="min-width: 280rpx;">
+ <view class="title-bold m-r-10">{{item.flowerName||'-'}}</view>
+ <view class="desc-gray">{{item.flowerLevelStr}}</view>
+ </view>
+ <view class="flex flex1">
+ <view class="flex1 text-center value title-bold">{{item.num||0}}扎</view>
+ <view class="flex1 text-center value">￥{{item.price||'0.00'}}</view>
</view>
</view>
- <view class="flex">
- <view class="form-item">
- <view class="label">订单数量</view>
- <view class="value">{{item.orderNum||0}}</view>
+ <view class="flex form-item">
+ <view class="m-r-20 flex" style="min-width: 280rpx;">
+ <view class="desc-gray m-r-10">下单时间</view>
+ <view class="desc-gray ">{{item.paymentTime||item.createdDate || '-'}}</view>
</view>
- <view class="form-item">
- <view class="label">买家数量</view>
- <view class="value">{{item.customerNum||0}}</view>
+ <view class="flex flex1">
+ <view class="flex1 text-center value "><span class="desc-gray m-r-10">数量</span>{{item.num||0}}扎
+ </view>
+ <view class="flex1 text-center value"><span
+ class="desc-gray m-r-10">合计</span>￥{{item.totalAmount||'0.00'}}</view>
</view>
</view>
- <view class="flex">
- <view class="form-item">
- <view class="label">服务费</view>
- <view class="value">{{item.serviceFee||0}}</view>
+
+
+ <view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">服务费</view>
+ <view class="value">{{item.serviceFee||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">售后理赔</view>
+ <view class="value">{{item.salesFee||0}}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="label">售后理赔</view>
- <view class="value">{{item.salesFee||0}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">质检扣款</view>
+ <view class="value">{{item.checkFee||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">集货站运费</view>
+ <view class="value">{{item.stationFee||0}}</view>
+ </view>
</view>
- </view>
- <view class="flex">
- <view class="form-item">
- <view class="label">质检扣款</view>
- <view class="value">{{item.checkFee||0}}</view>
- </view>
- <view class="form-item">
- <view class="label">集货站运费</view>
- <view class="value">{{item.stationFee||0}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">服务费率</view>
+ <view class="value">{{item.serviceFeeRate||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">收入</view>
+ <view class="value">{{item.income||0}}</view>
+ </view>
</view>
</view>
</view>
- <!-- <view class="line"></view> -->
- <view class="form">
+ <!-- <view class="form">
<view class="flex">
<view class="form-item">
<view class="label title-bold">交易合计</view>
@@ -59,7 +94,7 @@
<view class="value t-red">￥{{item.settlementAmount||0}}</view>
</view>
</view>
- </view>
+ </view> -->
</view>
</view>
</view>
@@ -67,6 +102,8 @@
<!-- 判断是否到底了，自动吧 -->
<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+ <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
+ @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="date"></u-datetime-picker>
</view>
</template>
@@ -78,11 +115,15 @@
tabIndex: 0,
query: {
day: ''
- }
+ },
+ show_time_picker_time: false,
+ tmp_picker_time: new Date(),
}
},
onLoad(options) {
this.query.day = options.day || ''
+ this.page.size = 200
+
uni.setNavigationBarTitle({
title: '配送结算明细-' + this.query.day
})
@@ -101,10 +142,49 @@
uni.stopPullDownRefresh()
},
methods: {
+ //选择timer的时间
+ async select_time_picker_time(e) {
+ // console.log('select_time_picker_time1', e, this.tmp_picker_time_item)
+ this.query.day = this.$util.toDate(new Date(e.value))
+ uni.setNavigationBarTitle({
+ title: '配送结算明细-' + this.query.day
+ })
+ this.show_time_picker_time = false
+ // this.$forceUpdate()
+ this.refreshList()
+ },
toDetail(item) {
uni.navigateTo({
url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
})
+ },
+ },
+ computed: {
+ tj_has() {
+ var v = 0
+ if (this.list) {
+ for (var item of this.list) {
+ if (item.status === 'COMPLETED') {
+ v += item.income || 0
+ }
+ }
+ }
+
+ return v.toFixed(2)
+ },
+ tj_total() {
+ var v = 0
+ if (this.list) {
+ for (var item of this.list) {
+ if (!item.status) {
+ v += item.totalAmount || 0
+ } else {
+ v += (item.income || 0)
+ }
+ }
+ }
+
+ return v.toFixed(2)
},
}
}
@@ -112,6 +192,8 @@
<style lang="scss" scope>
.order-sale-list {
+ .tj-money {}
+
.order-sale-item {
margin-bottom: 20rpx;
padding: 22rpx;
@@ -138,6 +220,7 @@
flex: 1;
// min-width: 40%;
// max-width: 50%;
+ font-size: 24rpx;
.label {
font-weight: 400;
diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index e2b9bfb..1e64cc5 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -60,7 +60,7 @@
<view class="label">结算单价</view>
</view>
<view class="tj-each flex1">
- <view class="value">{{dto.flowerNum||'0.00'}}</view>
+ <view class="value">{{dto.flowerNum||'0'}}扎</view>
<view class="label">商品数量</view>
</view>
<view class="tj-each flex1">
@@ -171,9 +171,12 @@
}
},
onLoad(options) {
+ console.log('options',options)
this.id = options.id || ''
- if (this.id)
- this.getList()
+ if (this.id){
+ this.getDetail()
+
+ }
},
@@ -186,7 +189,7 @@
// #ifdef PUB_PARTNER
turl = '/api/partner/settlement/list/view?id='
// #endif
-
+ console.log('turl',turl)
this.$message.showLoading()
@@ -266,8 +269,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
flex: 1;
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index f76c55c..6a27d29 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -18,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>
@@ -25,37 +35,37 @@
</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>
--
Gitblit v1.9.3