From 386fa24ed7313fd08c011df186ae7bc3c3137f73 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Mon, 17 Jul 2023 18:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E5=8D=95=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/aftersale/detail.vue | 11 ++++++++++-
 src/views/oms/aftersale/index.vue  |  5 +++++
 src/views/oms/order/index.vue      |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/oms/aftersale/detail.vue b/src/views/oms/aftersale/detail.vue
index cc0d61d..2c5dad8 100644
--- a/src/views/oms/aftersale/detail.vue
+++ b/src/views/oms/aftersale/detail.vue
@@ -65,7 +65,7 @@
                     <el-descriptions-item label="收货人姓名">{{ addressInfo.name }}</el-descriptions-item>
                     <el-descriptions-item label="收货人手机号">{{ addressInfo.userPhone }}</el-descriptions-item>
                     <el-descriptions-item label="收货区域">{{ addressInfo.area }}</el-descriptions-item>
-                    <el-descriptions-item label="详细地址">{{ addressInfo.address }}</el-descriptions-item>
+                    <el-descriptions-item label="详细地址">{{ getHiddenDetailAddress(addressInfo.address) }}</el-descriptions-item>
                 </el-descriptions>
             </el-card>
             <el-card>
@@ -86,6 +86,15 @@
                   <el-table-column label="购买数量" prop="buyNum"></el-table-column>
                 </el-table>
             </el-card>
+            <el-card>
+              <el-descriptions title="物流信息" :column="3" border label-class-name="my-label" contentClassName="my-content">
+                <el-descriptions-item label="发货时间">{{ parseTime(orderDetail.deliveryTime, '')
+                  }}</el-descriptions-item>
+                <el-descriptions-item label="快递单号">{{ orderDetail.expressNo }}</el-descriptions-item>
+                <el-descriptions-item label="物流公司">{{ orderDetail.expressNo ? '顺丰速运' : '' }}</el-descriptions-item>
+<!--                <el-descriptions-item label="物流公司">{{ orderDetail.expressName }}</el-descriptions-item>-->
+              </el-descriptions>
+            </el-card>
             <!-- 售后详细信息 -->
             <el-dialog title="售后详细信息" :visible.sync="open" width="1100px" append-to-body>
                 <el-descriptions :column="2" border label-class-name="my-label" contentClassName="my-content">
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 4b6eae8..b649d23 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -59,6 +59,11 @@
               getAftersaleTypeText(scope.row) }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="申请时间" align="center" prop="applyRefundTime" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyRefundTime, '')}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="处理时间" align="center" prop="handleTime" width="180" >
         <template slot-scope="scope">
             <span>{{ parseTime(scope.row.handleTime, '')}}</span>
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index f2486a8..6741504 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
       <el-form-item label="订单状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
-          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value"/>
+          <el-option v-for="(item, index) in dict.type.oms_order_status" :label="item.label" :value="item.value" v-if="item.value < 11"/>
         </el-select>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderSn">