From 5525ed0398c496b43a09377d0c59d143e7ff3e98 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 19:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 sub_pages/supplier/order-manage/order-manage-settlement.vue |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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..a79379d 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>

--
Gitblit v1.9.3