From b8653ff8f4665f611dcd7580e1bde88b9cf9941f Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Tue, 19 May 2020 17:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/data/CustomerDetail.vue    | 6 +++---
 src/pages/shop/IncreaseDataStore.vue | 4 +++-
 src/pages/user/AccountManager.vue    | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/data/CustomerDetail.vue b/src/pages/data/CustomerDetail.vue
index fd75f81..ea30ee5 100644
--- a/src/pages/data/CustomerDetail.vue
+++ b/src/pages/data/CustomerDetail.vue
@@ -11,17 +11,17 @@
                         <span class="left-15 txt-font-a">零售公司</span>
                         <Select v-model="companyId" filterable class="left-15 txt-font-a search-select"
                                 @on-change="companySelect">
-                            <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                            <Option v-for="(item,index) in companyList" :value="item.id" :key="1+index+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 search-select"
                                  @on-change="downShopChange">
-                            <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                            <Option v-for="(item,index) in shopList" :value="item.id" :key="2+index+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 search-select"
                                 >
-                            <Option v-for="item in sellerList" :value="item.staffId" :key="item.id">{{ item.name }}
+                            <Option v-for="(item,index) in sellerList" :value="item.staffId" :key="3+index+item.id">{{ item.name }}
                             </Option>
                         </Select>
 
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index 97afb2b..1543a26 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -111,6 +111,9 @@
             this.selectDate.push(endDate);
             this.allCompany();
             this.storeInit();
+
+            this.pageNum = 1;
+
             this.generalizeOfStore();
         },
         methods: {
@@ -190,7 +193,6 @@
             },
             generalizeOfStore() {
 
-                this.pageNum = 1;
                 this.tableLoading = true;
                 if (this.selectDate[0] === "") {
                     this.$Message.info("请选择日期");
diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue
index de31d2f..1a0b554 100644
--- a/src/pages/user/AccountManager.vue
+++ b/src/pages/user/AccountManager.vue
@@ -444,8 +444,7 @@
                 }
                 customerIds = this.customerList.map(item => item.id);
 
-                let request =
-                    {userId: that.userId, customerIds: JSON.stringify(customerIds)};
+                let request = {userId: that.userId, customerIds: customerIds, companyId: companyId};
                 staff.downShopData(request, function (data) {
                     data = data.data.results;
                     if (data) {