From 15ae4a0daffaa7fdec2566a2fc96409b90822a09 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:13:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index 9b8293a..9de9b62 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -9,7 +9,7 @@
<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="m-r-20">待结算：￥{{ (tj_total-tj_has).toFixed(2)||0}}</view>
<view class="t-red">已结算：￥{{tj_has||0}}</view>
</view>
</view>
@@ -49,24 +49,30 @@
class="desc-gray m-r-5">合计</span>￥{{item.totalAmount||'0.00'}}</view>
</view>
</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">订单号</view>
+ <view class="value">{{item.orderNo||'-'}}</view>
+ </view>
+ </view>
<view v-if="item.status">
<view class="flex">
<view class="form-item">
<view class="label">收入</view>
- <view class="value">{{item.income||0}}</view>
+ <view class="value">￥{{item.income||0}}</view>
</view>
<view class="form-item">
<view class="label">集货站运费</view>
- <view class="value">{{item.stationFee||0}}</view>
+ <view class="value">￥{{item.stationFee||0}}</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
- <view class="value">{{item.serviceFee||0}}</view>
+ <view class="value">￥{{item.serviceFee||0}}</view>
</view>
<view class="form-item">
<view class="label">服务费率</view>
@@ -75,9 +81,14 @@
</view>
<view class="flex">
+
+ <view class="form-item">
+ <view class="label">收货时间</view>
+ <view class="value">{{item.receiveTime||''}}</view>
+ </view>
<view class="form-item">
<view class="label">售后退款</view>
- <view class="value">{{item.salesFee||0}}</view>
+ <view class="value">￥{{item.salesFee||0}}</view>
</view>
</view>
@@ -88,7 +99,7 @@
</view>
<view class="form-item">
<view class="label">缺货扣款</view>
- <view class="value">{{item.lackFee||0}}</view>
+ <view class="value">￥{{item.lackFee||0}}</view>
</view>
</view>
<view class="flex">
@@ -98,7 +109,7 @@
</view>
<view class="form-item">
<view class="label">补货扣款</view>
- <view class="value">{{item.replaceFee||0}}</view>
+ <view class="value">￥{{item.replaceFee||0}}</view>
</view>
</view>
<view class="flex">
@@ -108,7 +119,7 @@
</view>
<view class="form-item">
<view class="label">降级扣款</view>
- <view class="value">{{item.checkFee||0}}</view>
+ <view class="value">￥{{item.checkFee||0}}</view>
</view>
</view>
</view>
@@ -126,11 +137,13 @@
</view>
</view> -->
<view class="component-buttons m-t-15" style="width: unset;">
- <view class="button-1 m-l-a m-r-10" v-if="!(item.salesNum===0)" @click.stop="toOpDetail('sale','售后',item)">
+ <view class="button-1 m-l-a m-r-10" v-if="!(item.salesNum===0)"
+ @click.stop="toOpDetail('sale','售后',item)">
售后详情</view>
<view class="button-1 m-l-a m-r-10" v-if="item.checkNum"
@click.stop="toOpDetail('reduce','降级',item)">降级详情</view>
- <view class="button-1 m-l-a m-r-10" v-if="item.lackNum" @click.stop="toOpDetail('lack','缺货',item)">
+ <view class="button-1 m-l-a m-r-10" v-if="item.lackNum"
+ @click.stop="toOpDetail('lack','缺货',item)">
缺货详情</view>
<view class="button-1 m-l-a m-r-10" v-if="item.replaceNum"
@click.stop="toOpDetail('replace','补货',item)">补货详情</view>
@@ -232,7 +245,8 @@
if (this.list) {
for (var item of this.list) {
if (!item.status) {
- v += item.totalAmount || 0
+ // v += item.totalAmount || 0
+ v += item.income || 0
} else {
v += (item.income || 0)
}
--
Gitblit v1.9.3