Merge branch 'bugfix/1月5生产bug' of http://git.gicdev.com/marketing-web/marketing into dev

src/views/recharge/board.vue

@@ -104,7 +104,7 @@
     <div class="dm-wrap" style="margin-top: 12px">
       <div class="pb22">
         <div slot="header" class="clearfix">
-          <el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')"></el-date-picker>
+          <el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')" @click.native="minDate = null"></el-date-picker>
           <select-depart v-if="config.isMoreAccount && config.showAllDepartment" :data="deparment2" @load="() => load('two')" @getDepartId="id => getDepartId(id, 'two')" @remote-search="val => remoteSearch(val, 'two')" :loading="deparment2.loading" />
           <span class="fz12 gray">* 此处仅支持筛选近半年的统计数据</span>
         </div>
@@ -158,6 +158,7 @@ export default {
     return {
       dateTime: [Date.now(), Date.now()],
       minDate: new Date(),
+      maxDate: new Date(),
       loading1: false,
       loading2: false,
       tableList: [],
@@ -176,9 +177,9 @@ export default {
           if (this.minDate) {
             const curTime = this.minDate.getTime();
             const min = curTime - oneMothods > halfYearBefore ? curTime - oneMothods : halfYearBefore;
-            return val.getTime() > curTime + oneMothods || val.getTime() < min;
+            return val.getTime() > curTime + oneMothods || val.getTime() < min || val.getTime() > this.maxDate;
           }
-          return val.getTime() <= halfYearBefore;
+          return val.getTime() <= halfYearBefore || val.getTime() > this.maxDate;
         },
         onPick: ({ maxDate, minDate }) => {
           this.minDate = minDate;