From 84b4c656424ed01dfcd5ca346eadf7a8a65ca085 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Fri, 24 Apr 2020 10:57:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/CustomerDetail.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/pages/CustomerDetail.vue b/src/pages/CustomerDetail.vue
index 998e1df..fe28800 100644
--- a/src/pages/CustomerDetail.vue
+++ b/src/pages/CustomerDetail.vue
@@ -26,15 +26,15 @@
 <!--              <Option v-for="item in regionList" :value="item.id" :key="item.id">{{ item.name }}</Option>-->
 <!--            </Select>-->
             <span  class="left-15 txt-font-a">零售公司</span>
-            <Select filterable placeholder="请选择公司" v-model="regionId" class="left-15 txt-font-a" style="width:190px" size="small" @on-change="downRegionChange">
+            <Select filterable placeholder="全部" v-model="regionId" class="left-15 txt-font-a" style="width:190px" size="small" @on-change="downRegionChange">
               <Option v-for="item in regionList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
-            <span class="left-15 txt-font-a">店铺选择</span>
-            <Select filterable placeholder="请选择店铺" v-model="shopId" class="left-15 txt-font-a" style="width:190px" size="small" @on-change="downShopChange">
+            <span class="left-15 txt-font-a">店铺</span>
+            <Select filterable placeholder="全部" v-model="shopId" class="left-15 txt-font-a" style="width:190px" size="small" @on-change="downShopChange">
               <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
-            <span class="left-15 txt-font-a">导购选择</span>
-            <Select filterable placeholder="请选择导购" v-model="sellerId" class="left-15 txt-font-a" style="width:190px" size="small">
+            <span class="left-15 txt-font-a">导购</span>
+            <Select filterable placeholder="全部" v-model="sellerId" class="left-15 txt-font-a" style="width:190px" size="small">
               <Option v-for="item in sellerList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
 
@@ -128,7 +128,7 @@
               //开始时间，结束时间
               totalSize: null,
               pageNum: 1,
-              pageSize: 3,
+              pageSize: 10,
               modal12: false,
               startDate: null,
               endDate: null,
@@ -270,13 +270,14 @@
           },
           exportData(){
               let that = this;
-              let title = "客户明细数据";
               let stdate = null;
               let eddate = null;
               if(that.dateRange[0]){
                   stdate = this.$moment(that.dateRange[0]).format("YYYY-MM-DD");
                   eddate = this.$moment(that.dateRange[1]).format("YYYY-MM-DD");
               }
+
+
               let csvdata = [];
               let request =
                   { userId: that.accUserId,
@@ -308,7 +309,10 @@
                           }
 
                       }
+                      if(stdate == null){stdate = "--";}
+                      if(eddate == null){eddate = "--";}
 
+                      let title = "零售公司推广情况("+stdate+"至"+eddate+")";
                     require.ensure([], () => {
                       const { export_json_to_excel } = require('../excel/Export2Excel');
                       const tHeader = ['序号', '客户名称', '所属门店', '店铺编号', '所属导购', '工号', '创建时间','客户手机号','关联会员','会员等级','会员生日'];