From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index 846e7e9..bb5c1ab 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -49,6 +49,12 @@
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">
@@ -75,6 +81,11 @@
</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>
@@ -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