fix: 修复bug

src/views/performance-manage/delivery-list.vue

@@ -170,17 +170,28 @@ const fields = [
   { label: '礼品编码', value: 'giftCode', sensKey: false },
   { label: 'SKU编码', value: 'giftSkuCode', sensKey: false },
   { label: 'SKU名称', value: 'giftSkuStandard', sensKey: false },
-  { label: '数量', value: 'refundQuantity', sensKey: false },
+  { label: '数量', value: 'exchangeQuantity', sensKey: false },
+  { label: '创建时间', value: 'createTime', sensKey: false },
+  { label: '发货时间', value: 'deliveryTime', sensKey: false },
+  { label: '履约单号', value: 'orderId', sensKey: false },
   { label: '发货单号', value: 'deliveryId', sensKey: false },
-  { label: '退货单号', value: 'refundId', sensKey: false },
+  { label: '状态', value: 'deliveryFlagStr', sensKey: false },
+  { label: '会员姓名', value: 'memberName', sensKey: true },
+  { label: '会员手机号', value: 'memberPhone', sensKey: true },
   { label: '会员姓名', value: 'memberName', sensKey: true },
   { label: '会员手机号', value: 'memberPhone', sensKey: true },
+  { label: '收货人姓名', value: 'consignee', sensKey: true },
+  { label: '收货人手机号', value: 'consigneePhone', sensKey: true },
+  { label: '收货人省', value: 'provinceName', sensKey: false },
+  { label: '收货人市', value: 'cityName', sensKey: false },
+  { label: '收货人区', value: 'countyName', sensKey: false },
+  { label: '收货人详细地址', value: 'consigneeAddress', sensKey: true },
+  { label: '收货人地址', value: 'consigneeArea', sensKey: false },
   { label: '来源应用', value: 'appName', sensKey: false },
   { label: '来源活动', value: 'activityName', sensKey: false },
-  { label: '发货单号', value: 'deliveryOrderId', sensKey: false },
-  { label: '发放文本内容', value: 'deliveryInfo', sensKey: false },
-  { label: '创建时间', value: 'createTime', sensKey: false },
-  { label: '关闭时间', value: 'updateTime', sensKey: false },
+  { label: '物流公司', value: 'logisticsCompanyName', sensKey: false },
+  { label: '物流单号', value: 'logisticsNo', sensKey: false },
+  { label: '自提核销码', value: 'writeOffCode', sensKey: false },
 ];
 
 export default {

src/views/performance-manage/record.vue

@@ -26,11 +26,11 @@
       </el-input>
       <div class="clearfix mt20" style="margin-top:20px">
         <el-date-picker class="w400 fl" v-model="daterange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" @change="handleSearch"></el-date-picker>
-        <el-button class="fr" type="primary" @click="exportConfig.exportVisible = true">导出</el-button>
+        <el-button class="fr" icon="el-icon-download" type="primary" @click="exportConfig.exportVisible = true">导出</el-button>
       </div>
     </header>
 
-    <el-table class="mt20" :data="list">
+    <el-table class="mt20" :data="list" @sort-change="handleSortChange">
       <el-table-column label="礼品信息" width="300">
         <template slot-scope="{ row }">
           <div class="goods-info">
@@ -39,7 +39,7 @@
               <div class="goods-text-name">
                 {{row.giftName}}
               </div>
-              <div class="goods-text-info">
+              <div v-if="row.giftType == 1" class="goods-text-info">
                 <div v-if="row.giftSkuStrand">
                   <span v-for="(item, i) in JSON.parse(row.giftSkuStrand || '[]')" :key="i">{{ item.specStandardName }}：{{ item.specStandardValueName }} &nbsp;&nbsp;</span>
                 </div>
@@ -131,18 +131,18 @@ import { dealExportParams } from '@/utils/common.js';
 
 const fields = [
   { label: '福利ID', value: 'giftId', sensKey: false },
+  { label: '配货方式', value: 'deliveryType', sensKey: false },
   { label: '礼品名称', value: 'giftName', sensKey: false },
   { label: '礼品编码', value: 'giftCode', sensKey: false },
   { label: 'SKU编码', value: 'giftSkuCode', sensKey: false },
   { label: 'SKU名称', value: 'giftSkuStandard', sensKey: false },
   { label: '数量', value: 'refundQuantity', sensKey: false },
+  { label: '履约单号', value: 'orderId', sensKey: false },
   { label: '发货单号', value: 'deliveryId', sensKey: false },
-  { label: '退货单号', value: 'refundId', sensKey: false },
   { label: '会员姓名', value: 'memberName', sensKey: true },
   { label: '会员手机号', value: 'memberPhone', sensKey: true },
   { label: '来源应用', value: 'appName', sensKey: false },
   { label: '来源活动', value: 'activityName', sensKey: false },
-  { label: '发货单号', value: 'deliveryOrderId', sensKey: false },
   { label: '发放文本内容', value: 'deliveryInfo', sensKey: false },
   { label: '创建时间', value: 'createTime', sensKey: false },
   { label: '关闭时间', value: 'updateTime', sensKey: false },
@@ -252,6 +252,13 @@ export default {
       this.searchValue = '';
       this.handleSearch();
     },
+    handleSortChange({ column, prop, order }) {
+      let map = {
+        descending: 'desc',
+        ascending: 'asc'
+      };
+      this.getList(map[order]);
+    },
   },
   filters: {
     formatDate(ms, type = 'date') {

src/views/performance-manage/refund.vue

@@ -226,18 +226,10 @@ const fields = [
   { label: '退货处理状态', value: 'refundFlag', sensKey: false },
   { label: '会员姓名', value: 'memberName', sensKey: true },
   { label: '会员手机号', value: 'memberPhone', sensKey: true },
-  { label: '收货人姓名', value: 'deliveryConsigneeName', sensKey: true },
-  { label: '收货人手机号', value: 'deliveryConsigneePhone', sensKey: true },
-  { label: '收货人省', value: 'deliveryProvinceName', sensKey: false },
-  { label: '收货人市', value: 'deliveryCityName', sensKey: false },
-  { label: '收货人区', value: 'deliveryCountyName', sensKey: false },
-  { label: '收货人详细地址', value: 'deliveryConsigneeAddress', sensKey: true },
-  { label: '收货人地址', value: 'deliveryConsigneeArea', sensKey: false },
-  { label: '来源应用', value: 'appName', sensKey: false },
-  { label: '来源活动', value: 'activityName', sensKey: false },
   { label: '退货物流公司', value: 'refundCompanyName', sensKey: false },
   { label: '退货物流单号', value: 'refundLogisticsNo', sensKey: false },
   { label: '退货原因', value: 'refundReason', sensKey: false },
+  { label: '拒绝原因', value: 'cancelReason', sensKey: false },
 ];
 
 export default {
@@ -388,11 +380,13 @@ export default {
             await handleRefundOrder(params);
             this.refuseDialog.visible = false;
             this.getList();
+            this.$message('操作成功');
           }
         });
       } else {
         handleRefundOrder(params).then(()=>{
           this.getList();
+          this.$message('操作成功');
         });
       }
     },