Merge branch 'feature/1223' into develop

project/src/components/customManage/manage.vue

@@ -17,6 +17,8 @@
       <loss-body :reset='resetFlag' @lossChange="lossChange"></loss-body>
       <!-- 付费情况 -->
       <screen-pay :reset='resetFlag' @payChange="payChange"></screen-pay>
+      <!-- 充值时间 -->
+      <date-picker :reset='resetFlag' title="充值时间" @changeTime="onChangePayTime" />
       <div class="reset" @click="resetEvent">重置</div>
     </div>
     <div class="tableInfo">
@@ -195,6 +197,8 @@ export default {
       tag_type: 0,//标签筛选类型 0不筛选 1满足其中一个 2同时满足 3无标签
       add_date_start: '',//添加日期 起始
       add_date_end: '',//添加日期 截止
+      last_pay_time_start: '',//充值时间 起始
+      last_pay_time_end: '',//充值时间 截止
       loss_status: null,//客户流失状态 没有筛选时传null 0未流失 1已流失
       pay_status: null,//	付款状态 没有筛选时传null 0未付款 1已付款
       pay_num_min: '',//最小付款次数，当pay_status是1时必传
@@ -261,6 +265,8 @@ export default {
           customer_name: this.input_keyword,
           add_date_start: this.add_date_start,
           add_date_end: this.add_date_end,
+          last_pay_time_start: this.last_pay_time_start,
+          last_pay_time_end: this.last_pay_time_end,
           add_way: this.add_way,
           pay_status: this.pay_status,
           pay_num_min: this.pay_num_min,
@@ -360,6 +366,8 @@ export default {
       this.tag_type = 0;
       this.add_date_start = '';
       this.add_date_end = '';
+      this.last_pay_time_start = '';
+      this.last_pay_time_end = '';
       this.loss_status = null;
       this.pay_status = null;
       this.pay_num_min = '';
@@ -406,6 +414,17 @@ export default {
       }
       this.init(1)
     },
+    // 监听“充值时间”筛选变化
+    onChangePayTime (time) {
+      if (!time || time && time.length == 0) {
+        this.last_pay_time_start = '';
+        this.last_pay_time_end = '';
+      } else {
+        this.last_pay_time_start = time[0]
+        this.last_pay_time_end = time[1]
+      }
+      this.init(1)
+    },
     tagDefine (data) {//标签选择回调
       if (data.tag == 1 || data.tag == 2) {
         if (data.tag_id_list && data.tag_id_list.length != 0) {
@@ -440,6 +459,8 @@ export default {
           customer_name: this.input_keyword,
           add_date_start: this.add_date_start,
           add_date_end: this.add_date_end,
+          last_pay_time_start: this.last_pay_time_start,
+          last_pay_time_end: this.last_pay_time_end,
           add_way: this.add_way,
           pay_status: this.pay_status,
           pay_num_min: this.pay_num_min,