fix: 修复bug

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

@@ -9,7 +9,7 @@
         <el-option label="门店自提" :value="2"></el-option>
       </el-select>
       <el-input class="w360 ml10" placeholder="请输入关键词进行搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
-        <el-select v-model="searchType" slot="prepend" style="width:140px;">
+        <el-select v-model="searchType" slot="prepend" style="width:140px;" @change="handleSearchTypeChange">
           <el-option label="商品名称" value="giftName"></el-option>
           <el-option label="礼品编码" value="giftCode"></el-option>
           <el-option label="sku编码" value="giftSkuCode"></el-option>
@@ -225,8 +225,8 @@ export default {
       sort = 'asc';
     } else {
       let now = Date.now();
-      this.query.endTime = this.$options.filters['formatDate'](now);
-      this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000);
+      this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
+      this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
     }
     this.getList(sort);
   },
@@ -292,6 +292,10 @@ export default {
         this.$refs.exportData.applyReport();
       });
     },
+    handleSearchTypeChange() {
+      this.searchValue = '';
+      this.handleSearch();
+    },
   },
   filters: {
     formatDate(ms, type = 'date') {

src/views/performance-manage/record.vue

@@ -15,7 +15,7 @@
         <el-option label="已关闭" :value="2"></el-option>
       </el-select>
       <el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
-        <el-select v-model="searchType" slot="prepend" style="width:160px;">
+        <el-select v-model="searchType" slot="prepend" style="width:160px;" @change="handleSearchTypeChange">
           <el-option label="礼品名称" value="giftName"></el-option>
           <el-option label="礼品编码" value="giftNo"></el-option>
           <el-option label="sku编码" value="giftSkuCode"></el-option>
@@ -68,10 +68,22 @@
             <div>
               应用单号：{{row.businessId}}
             </div>
-            <div class="mt10">
+            <div v-if="row.orderFlag == 1 && row.giftType == 1" class="mt10">
               <span>发货单号：</span>
               <el-button type="text" @click="linkToDetail(row.deliveryOrderId)">{{row.deliveryOrderId}}</el-button>
             </div>
+            <div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10">
+              {{row.deliveryInfo}}
+            </div>
+            <div v-else-if="row.orderFlag == 0" class="mt10">
+              <span style="display:flex">
+                <span style="flex-shrink:0">备注：</span>
+                <span>{{row.waitReason}}</span>
+              </span>
+            </div>
+            <div v-else-if="row.orderFlag == 2" class="mt10">
+              <span>关闭时间： {{row.updateTime | formatDate('dateTime')}}</span>
+            </div>
           </el-popover>
         </template>
       </el-table-column>
@@ -178,6 +190,9 @@ export default {
         breadName: '履约记录'
       },
     ]);
+    let now = Date.now();
+    this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
+    this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
     this.getApplicationList();
     this.getList();
   },
@@ -233,6 +248,10 @@ export default {
       // this.$router.push({ path: '/performance/delivery-detail', query: { deliveryId } });
       window.open(`/performance/delivery-detail?deliveryId=${deliveryId}`);
     },
+    handleSearchTypeChange() {
+      this.searchValue = '';
+      this.handleSearch();
+    },
   },
   filters: {
     formatDate(ms, type = 'date') {

src/views/performance-manage/refund.vue

@@ -12,13 +12,13 @@
         <el-option label="已关闭" :value="3"></el-option> -->
       </el-select>
       <el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
-        <el-select class="w160" v-model="searchType" slot="prepend">
+        <el-select class="w160" v-model="searchType" slot="prepend" @change="handleSearchTypeChange">
           <el-option label="退货单号" value="refundId"></el-option>
           <el-option label="商品名称" value="giftName"></el-option>
           <el-option label="礼品编码" value="giftCode"></el-option>
           <el-option label="sku编码" value="giftSkuCode"></el-option>
           <el-option label="发货单号" value="deliveryId"></el-option>
-          <el-option label="会员手机号" value="consigneePhone"></el-option>
+          <el-option label="会员手机号" value="memberPhone"></el-option>
           <el-option label="会员姓名" value="memberName"></el-option>
           <el-option label="会员卡号" value="memberCardNo"></el-option>
           <el-option label="履约单号" value="orderId"></el-option>
@@ -295,6 +295,9 @@ export default {
         breadName: '退货单'
       },
     ]);
+    let now = Date.now();
+    this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
+    this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
     this.getApplicationList();
     this.handleChangeRefundFlag();
   },
@@ -387,16 +390,7 @@ export default {
       let sort;
       if(this.query.refundFlag === 0) {
         sort = 'asc';
-        this.query.endTime = '';
-        this.query.startTime = '';
-      } else if(this.query.refundFlag) {
-        sort = 'desc';
-        let now = Date.now();
-        this.query.endTime = this.$options.filters['formatDate'](now);
-        this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000);
       } else {
-        this.query.endTime = '';
-        this.query.startTime = '';
         sort = 'desc';
       }
       this.pager.currentPage = 1;
@@ -408,6 +402,10 @@ export default {
     onError(e) {
       this.$message.error('复制失败');
     },
+    handleSearchTypeChange() {
+      this.searchValue = '';
+      this.handleSearch();
+    },
   },
   filters: {
     formatDate(ms, type = 'date') {