From 0da245b7df5dbc5bdde78ca5fa1b344d51602fb5 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 10 May 2020 00:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9B=B6=E5=94=AE=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=BC=96=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseStoreManager.vue    | 19 +++++++++++++++----
 src/services/store/IncreaseStoreManager.js |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue
index 1754e8d..30c966f 100644
--- a/src/pages/shop/IncreaseStoreManager.vue
+++ b/src/pages/shop/IncreaseStoreManager.vue
@@ -17,14 +17,14 @@
                         <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                     </Select>
                     <Button type="primary" @click="searchCustomerDataBtnClick" class="search-btn">查询</Button>
-                    <Button type="primary" @click="downloadStoreCode" style="margin-right: 10px;">批量下载门店码</Button>
-                    <Button type="primary"  @click="downloadStoreSellerCode"  style="margin-right: 10px;">批量下载导购码</Button>
+                    <Button type="primary" @click="downloadStoreCode" style="margin-left: 30px;">批量下载门店码</Button>
+                    <Button type="primary"  @click="downloadStoreSellerCode"  style="margin-left: 30px;">批量下载导购码</Button>
                     <!--<Button type="primary" @click="open()" style="margin-right: 10px;">开通门店号</Button>-->
                 </Row>
             </i-col>
         </Row>
 
-        <Table :columns="columns1" :data="data1" class="table-store" size="small">
+        <Table :loading="loading" :columns="columns1" :data="data1" class="table-store" size="small">
             <template slot-scope="{row}" slot="qrCodeAction">
                 <img :src="require('../../../static/img/qrCode-init.png')" @click="show(row)"
                      class="table-img-qr-code"/>
@@ -171,6 +171,7 @@
         inject: ['setMenuName'],
         data() {
             return {
+                loading: false,
                 userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
                 searchShop: null,
                 total: 0,
@@ -233,6 +234,11 @@
                         key: 'companyName',
                         className: 'table-width-200'
                     },
+                    {
+                        title: '零售公司编码',
+                        key: 'companyCode',
+                        className: 'table-width-100'
+                    },
                     {
                         title: '员工数',
                         key: 'staffNum',
@@ -337,6 +343,8 @@
             },
             listOfStore() {
                 let that = this;
+                this.loading = true;
+
                 let request = {
                     userId: that.userId,
                     regionId: that.changeData(that.regionId),
@@ -348,6 +356,7 @@
                 };
                 http.storeList(request, function (data) {
                     data = data.data;
+                    that.loading = false;
                     if (data.code == "0000") {
                         that.data1 = [];
                         let datas = data.results;
@@ -362,7 +371,9 @@
                         }
                         that.data1 = datas.list;
                     }
-                })
+                }, function (error) {
+                    that.loading = false;
+                });
             },
             addStoreWX: function (request) {
                 let that = this;
diff --git a/src/services/store/IncreaseStoreManager.js b/src/services/store/IncreaseStoreManager.js
index d45c01c..dc263e6 100644
--- a/src/services/store/IncreaseStoreManager.js
+++ b/src/services/store/IncreaseStoreManager.js
@@ -15,8 +15,8 @@ import axios from "axios";
 export function uploadUser(params, call) {
     return http.post('/store/emp/import', params).then(call);
 }
-export function storeList(params, call) {
-    return http.post('/store/emp/list', params).then(call);
+export function storeList(params, call, errorCallBack) {
+    return http.post('/store/emp/list', params).then(call).catch(errorCallBack);
 }
 export function addStoreWX(params, call) {
     return http.post('/user/add', params).then(call);