From 5169c491d4620a1bfd8d302d248c636c7e7907e4 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Thu, 21 May 2020 21:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseDataCompany.vue  |  5 +--
 src/pages/shop/IncreaseDataStaff.vue    | 19 +++++++++---
 src/pages/shop/IncreaseDataStore.vue    |  6 ++--
 src/pages/shop/IncreaseStoreManager.vue | 41 +++----------------------
 4 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 95abd80..bec7e4f 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -11,7 +11,8 @@
 
                     <span class="search-span">零售公司</span>
                     <Select v-model="selectedCompany" filterable class="search-select">
-                        <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        <Option v-for="item in companyList" :value="item.id" :key="'gs' + item.id">{{item.name }}
+                        </Option>
                     </Select>
                     <Button type="primary" @click="generalizeOfRetail" class="search-btn">查询</Button>
                     <div class="search-div-btn">
@@ -282,7 +283,7 @@
 <style scoped>
 
 
-    .search-btn{
+    .search-btn {
         margin-left: 40px;
     }
 </style>
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 83168a8..bd57302 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -4,20 +4,24 @@
             <i-col span="24" class="search-col">
                 <Row class="row-style">
                     <span class="search-span">选择日期</span>
-                    <DatePicker @on-change="onChangeDateLister" :value="selectDate" type="daterange" split-panels
+                    <DatePicker :option="dateOption" @on-change="onChangeDateLister" :value="selectDate"
+                                type="daterange" split-panels
                                 placeholder="请选择日期" class="date-picker"></DatePicker>
                     <span class="search-span">零售公司</span>
                     <Select v-model="selectedCompany" @on-change="storeOfCompany" filterable class="search-select">
-                        <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        <Option v-for="item in companyList" :value="item.id" :key="'gs' + item.id">{{ item.name }}
+                        </Option>
                     </Select>
                     <span class="search-span">店铺</span>
-                    <Select v-model="selectedStore" filterable  @on-change="sellerOfStore" class="search-select">
-                        <Option v-for="item in storeList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                    <Select v-model="selectedStore" filterable @on-change="sellerOfStore" class="search-select">
+                        <Option v-for="item in storeList" :value="item.id" :key="'dp' + item.id">{{ item.name }}
+                        </Option>
                     </Select>
 
                     <span class="search-span">导购</span>
                     <Select v-model="selectedStaff" filterable class="search-select">
-                        <Option v-for="item in staffList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        <Option v-for="item in staffList" :value="item.id" :key="'dg' + item.id">{{ item.name }}
+                        </Option>
                     </Select>
 
                     <Button type="primary" @click="generalizeOfSeller" class="search-btn">查询</Button>
@@ -43,6 +47,11 @@
         name: "IncreaseDataStaff",
         data() {
             return {
+                dateOption: {
+                    disabledDate(date) {
+                        return date && date.valueOf() < Date.now();
+                    }
+                },
                 selectedCompany: null,
                 companyList: [],
                 selectedStore: null,
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index 1543a26..2b1a4e5 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -8,11 +8,13 @@
                                 placeholder="请选择日期" class="date-picker"></DatePicker>
                     <span class="search-span">零售公司</span>
                     <Select v-model="selectedCompany" filterable class="search-select" @on-change="storeOfCompany">
-                        <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        <Option v-for="item in companyList" :value="item.id" :key="'gs' +  item.id">{{ item.name }}
+                        </Option>
                     </Select>
                     <span class="search-span">店铺</span>
                     <Select v-model="selectedStore" filterable class="search-select">
-                        <Option v-for="item in storeList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        <Option v-for="item in storeList" :value="item.id" :key="'dp' +  item.id">{{ item.name }}
+                        </Option>
                     </Select>
 
                     <Button type="primary" @click="generalizeOfStore" class="search-btn">查询</Button>
diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue
index c1d84f3..cd2c6c1 100644
--- a/src/pages/shop/IncreaseStoreManager.vue
+++ b/src/pages/shop/IncreaseStoreManager.vue
@@ -261,36 +261,7 @@
                         slot: 'action'
                     }
                 ],
-                data1: [
-                    /* {
-                         id: 1,
-                         storeName: '店铺1',
-                         storeWx: 'D1',
-                         staffNum: 10,
-                         customerNum: 999
-                     },
-                     {
-                         id: 2,
-                         storeName: '店铺2',
-                         storeWx: 'D2',
-                         staffNum: 10,
-                         customerNum: 999
-                     },
-                     {
-                         id: 3,
-                         storeName: '店铺3',
-                         storeWx: 'D3',
-                         staffNum: 10,
-                         customerNum: 999
-                     },
-                     {
-                         id: 4,
-                         storeName: '店铺4',
-                         storeWx: 'D4',
-                         staffNum: 10,
-                         customerNum: 999
-                     }*/
-                ],
+                data1: [],
                 // 开通企业微信 表单
                 formValidate: {
                     alias: '',
@@ -309,12 +280,6 @@
                     storeId: '',
                 },
                 ruleValidate: {
-                    userId: [
-                        {required: true, message: '账号不能为空', trigger: 'blur'}
-                    ],
-                    // gender: [
-                    //     { required: true, message: '请选择性别', trigger: 'change' }
-                    // ],
                     mobile: [
                         {required: true, message: '手机号码不能为空', trigger: 'blur'}
                     ],
@@ -442,7 +407,9 @@
                 this.downShopData();
             },
             //零售公司选择
-            companySelect: function () {
+            companySelect: function (value) {
+                this.companyId = value;
+
                 //加载店铺
                 this.downShopData(this.companyId);
                 this.selectedStore = 0;