支付时间和完成时间

src/views/live/liveAfteraSales/index.vue

@@ -24,9 +24,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="consigneePhone">
+      <el-form-item label="会员手机号" prop="userPhone">
         <el-input
-          v-model="queryParams.consigneePhone"
+          v-model="queryParams.userPhone"
           placeholder="请输入手机号"
           clearable
           size="small"
@@ -36,8 +36,8 @@
 
 
 
-      <el-form-item label="退款类型" prop="serviceType">
-        <el-select  v-model="queryParams.serviceType" placeholder="请选择退款类型" clearable size="small" >
+      <el-form-item label="退款类型" prop="refundType">
+        <el-select  v-model="queryParams.refundType" placeholder="请选择退款类型" clearable size="small" >
           <el-option
             v-for="item in serviceTypeOptions"
             :key="item.dictValue"
@@ -48,7 +48,7 @@
       </el-form-item>
 
 
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="审核状态" prop="status">
         <el-select  v-model="queryParams.status" placeholder="请选择状态" clearable size="small" >
           <el-option
             v-for="item in statusOptions"
@@ -79,7 +79,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="物流状态" prop="deliveryStatus">
+      <el-form-item label="客户退回物流状态" prop="deliveryStatus">
         <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
           <el-option
             v-for="item in deliveryStatusOptions"
@@ -90,7 +90,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="物流单号" prop="deliverySn">
+      <el-form-item label="客户退回物流单号" prop="deliverySn">
         <el-input
           v-model="queryParams.deliverySn"
           placeholder="物流/退回物流单号"
@@ -139,9 +139,9 @@
       <el-table-column label="订单单号" align="center" prop="orderCode" />
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="退款金额" align="center" prop="refundAmount" />
-      <el-table-column label="退款类型" align="center" prop="serviceType" >
+      <el-table-column label="退款类型" align="center" prop="refundType" >
         <template slot-scope="scope">
-          <dict-tag :options="serviceTypeOptions" :value="scope.row.serviceType"/>
+          <dict-tag :options="serviceTypeOptions" :value="scope.row.refundType"/>
         </template>
       </el-table-column>
       <el-table-column label="申请原因" align="center" prop="reasons" />
@@ -244,21 +244,28 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orderCode: null,
-        refundAmount: null,
-        serviceType: null,
+        refundType: null,             // 退款类型，替代serviceType
         reasons: null,
         explains: null,
         explainImg: null,
-        shipperCode: null,
+        deliveryCode: null,
         deliverySn: null,
         deliveryName: null,
         status: null,
-        salesStatus: null,
+        Status: null,
         isDel: null,
         userId: null,
         consignee: null,
-        phoneNumber: null,
-        address: null
+        phoneNumber: null,            // 之前是consigneePhone，改成phoneNumber
+        address: null,
+        companyId: null,
+        companyUserId: null,
+        deptId: null,
+        companyUserNickName: null,    // 新增员工姓名
+        deliveryStatus: null,         // 物流状态，确认是否接口支持
+        createTimeBegin: null,        // 创建时间起
+        createTimeEnd: null,          // 创
+        userPhone: null
       },
       // 表单参数
       form: {},

src/views/live/liveOrder/index.vue

@@ -189,7 +189,11 @@
           <span>{{ scope.row.payTime }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" :formatter="orderStatusFormatter"/>
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="item">
+          <dict-tag :options="orderStatusOptions" :value="item.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">