From ddf3769b2056811d0b18162e8321280aa6a14602 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Thu, 16 Apr 2020 17:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/CustomerDetail.vue | 46 ++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/pages/CustomerDetail.vue b/src/pages/CustomerDetail.vue
index dfad2ac..ea1edc1 100644
--- a/src/pages/CustomerDetail.vue
+++ b/src/pages/CustomerDetail.vue
@@ -15,6 +15,8 @@
       <i-col span="32">
         <row>
           <row style="height: 90px;background: #f7f8fa;border: 1px solid #E8ECF2;line-height: 90px">
+            <span>选择日期</span>
+            <DatePicker type="daterange" :start-date="new Date()" placement="bottom-end" placeholder="Select date" style="width: 200px"></DatePicker>
             <span style="margin-left: 48px" class="txt-font-a" >开始时间</span>
             <DatePicker v-model="startDate" class="left-15 txt-font-a" type="date" :options="options1" placeholder="选择开始时间" style="width: 200px"></DatePicker>
             <span class="left-15 txt-font-a">结束时间</span>
@@ -119,7 +121,7 @@
               //开始时间，结束时间
               totalSize: null,
               pageNum: 1,
-              pageSize: 1,
+              pageSize: 3,
               modal12: false,
               startDate: null,
               endDate: null,
@@ -143,32 +145,49 @@
                   key: 'name'
                 },
                 {
-                  title: '客户手机',
-                  key: 'phone'
+                  title: '所属门店',
+                  key: 'shopName'
+                },
+                {
+                  title: '店铺编号',
+                  key: 'shopCode'
                 },
                 {
                   title: '所属导购',
                   key: 'sellerName'
                 },
                 {
-                  title: '关联会员',
-                  key: 'vipName'
+                  title: '工号',
+                  key: 'sellerCode'
                 },
                 {
-                  title: '消费次数',
-                  key: 'salesNum'
+                  title: '创建时间',
+                  key: 'createTime'
                 },
                 {
-                  title: '消费金额',
-                  key: 'salesAmt'
+                  title: '客户手机号',
+                  key: 'phone'
+                },
+                {
+                  title: '关联会员',
+                  key: 'vipName'
                 },
                 {
                   title: '会员等级',
                   key: 'vipLevel'
                 },
+
                 {
                   title: '会员生日',
                   key: 'birthday'
+                }/*,
+                {
+                  title: '消费次数',
+                  key: 'salesNum'
+                },
+                {
+                  title: '消费金额',
+                  key: 'salesAmt'
                 },
                 {
                   title: '操作',
@@ -194,7 +213,7 @@
 
                     );
                   }
-                }
+                }*/
               ],
               data1: [
                 {
@@ -234,7 +253,10 @@
             }
           },
           searchCustomerDataBtnClick: function () {
+            this.totalSize= null;
+
             this.getCustomerData();
+
           },
           getCustomerData: function () {
             let that = this;
@@ -256,9 +278,13 @@
                   if(entity){
                     if(i === 0) that.totalSize = entity.totalSize;
                     let birthday = entity.birthday;
+                    let createTime = entity.createTime;
                     if(birthday){
                       entity.birthday = that.$moment(birthday).format("MM-DD")
                     }
+                    if(createTime){
+                      entity.createTime = that.$moment(createTime).format("YYYY-MM-DD")
+                    }
                     that.data1.push(entity);
                     that.checkParamBlank(entity);
                   }