From 76ad77c5870a41d36a92a66a82ec43ca75b8dc62 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Fri, 17 Apr 2020 10:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86=E5=8E=9F?=
 =?UTF-8?q?=E5=9E=8B=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          | 37 +++++++++++++++++++--------
 src/services/datacenter/DataCenter.js | 10 +++++++-
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/pages/CustomerDetail.vue b/src/pages/CustomerDetail.vue
index ea1edc1..89d4aaf 100644
--- a/src/pages/CustomerDetail.vue
+++ b/src/pages/CustomerDetail.vue
@@ -15,14 +15,18 @@
       <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>
+            <span class="left-15">选择日期</span>
+            <DatePicker v-model="dateRange" class="left-15" type="daterange" placement="bottom-start" split-panels placeholder="请选择日期区间" style="width: 200px" size="small"></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>
-            <DatePicker  v-model="endDate"  class="left-15 txt-font-a" :options="options2" type="date" placeholder="选择结束时间" style="width: 200px"></DatePicker>
-            <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">
+            <DatePicker  v-model="endDate"  class="left-15 txt-font-a" :options="options2" type="date" placeholder="选择结束时间" style="width: 200px"></DatePicker>-->
+<!--            <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">-->
+<!--              <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">
               <Option v-for="item in regionList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
             <span class="left-15 txt-font-a">店铺选择</span>
@@ -113,7 +117,7 @@
   </div>
 </template>
 <script>
-   import customerDetail from "../services/datacenter/DataCenter";
+  import customerDetail, {downCompanyData} from "../services/datacenter/DataCenter";
     export default {
         inject:['checkParamBlank'],
         data() {
@@ -127,6 +131,7 @@
               endDate: null,
               regionId: null,
               customerName: null,
+              dateRange: [],
               regionList: [{"id":1,"name":"一区"},{"id":2,"name":"二大区"}],
               shopId: null,
               shopList: [{"id":1,"name":"一区"},{"id":2,"name":"二大区"}],
@@ -261,10 +266,17 @@
           getCustomerData: function () {
             let that = this;
             that.data1 = [];
+            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 request =
                     { userId: that.accUserId,
-                      startDate: that.startDate,
-                      endDate: that.endDate,
+                      startDate: stdate,
+                      endDate: eddate,
                       regionId: that.changeData(that.regionId),
                       shopId: that.changeData(that.shopId),
                       sellerId: that.changeData(that.sellerId),
@@ -331,7 +343,7 @@
             that.regionList = [{"id":0,"name":"全部"}];
             let request =
                     {userId: that.accUserId};
-            customerDetail.downRegionData(request, function (data) {
+            customerDetail.downCompanyData(request, function (data) {
               data = data.data.results;
               if(data){
                   for(let i=0;i<data.length;i++){
@@ -346,10 +358,15 @@
 
           downShopChange: function () {
             let that = this;
+            alert("dsf");
              that.downSellerData();
           },
           downRegionChange: function () {
+            let that = this;
             this.downShopData();
+            if(!that.shopId){
+              that.downShopChange();
+            }
           },
           changeData: function (value) {
             if(value == 0){return null;}
diff --git a/src/services/datacenter/DataCenter.js b/src/services/datacenter/DataCenter.js
index c65fbfd..29c8904 100644
--- a/src/services/datacenter/DataCenter.js
+++ b/src/services/datacenter/DataCenter.js
@@ -39,10 +39,18 @@ export function downRegionData(params, call) {
     return http.post('/region/user/only/region',params).then(call)
 }
 
+/**
+ * 下拉框数据品牌公司
+ */
+export function downCompanyData(params, call) {
+    return http.get('/retail/company',params).then(call)
+}
+
 export default {
     dataDetail: dataDetail,
     downSellerData: downSellerData,
     downShopData,
     downRegionData,
-    editCustomerData
+    editCustomerData,
+    downCompanyData
 }