From af6bdfd94db73ce6d09ba2a36057adbf1bdab73e Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Wed, 27 May 2020 17:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseStoreManager.vue |   6 +++---
 src/pages/user/AccountManager.vue       |   2 +-
 static/excel/批量账户导入.xls           | Bin 18944 -> 18432 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue
index b21eb39..6dccc87 100644
--- a/src/pages/shop/IncreaseStoreManager.vue
+++ b/src/pages/shop/IncreaseStoreManager.vue
@@ -3,7 +3,7 @@
         <Row class="search-row">
             <i-col span="24" class="search-col">
                 <Row class="row-style">
-                    <i-input placeholder="店铺名称或编码" class="search-select" v-model="searchShop"/>
+                    <i-input placeholder="店铺名称或编码" class="search-select" :on-enter="searchCustomerDataBtnClick" v-model="searchShop"/>
                     <span class="search-span">大区</span>
                     <Select v-model="regionId" filterable class="search-select" @on-change="regionSelect">
                         <Option v-for="(item,index) in regionList" :value="item.id" :key=" index + item.id">{{ item.name }}</Option>
@@ -19,7 +19,7 @@
                     <Button type="primary" @click="searchCustomerDataBtnClick" class="search-btn">查询</Button>
                     <Button type="primary" @click="downloadStoreCode" style="margin-left: 20px;">批量下载门店码</Button>
                     <Button type="primary"  @click="downloadStoreSellerCode"  style="margin-left: 20px;">批量下载导购码</Button>
-                    <!--<Button type="primary" @click="open()" style="margin-right: 10px;">开通门店号</Button>-->
+                    <Button type="primary" @click="isShowImport = true" style="margin-right: 10px;">批量导入账号</Button>
                     <Button type="primary"  @click="OnClickListerDownloadData"  style="margin-left: 20px;">导出</Button>
 
                 </Row>
@@ -185,7 +185,7 @@
                 isShowError: false,
                 isShowAdd: false,
                 showStoreName: '',
-                updateUrl: http.getBaseUrl() + "/store/emp/import",
+                updateUrl: http.getBaseUrl() + "/store/emp/staff/import",
                 downLoadStoreCodeUrl: http.getBaseUrl() + "/store/emp/download/store/code",
                 qrCodeImage: '',
                 selectedRegion: 0,
diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue
index af96aaf..ed67c0d 100644
--- a/src/pages/user/AccountManager.vue
+++ b/src/pages/user/AccountManager.vue
@@ -3,7 +3,7 @@
         <template>
             <Row class="search-row">
                 <!--                    <span class="search-span">账户名</span>-->
-                <i-input placeholder="搜索用户名/账户" class="left-15 search-select" v-model="searchContent"/>
+                <i-input placeholder="搜索用户名/账户" class="left-15 search-select" :on-enter="listAccountInfoFunction" v-model="searchContent"/>
                 <span class="search-span">角色</span>
                 <Select filterable placeholder="请选择角色" v-model="selectedRoleId" class="left-15 search-select"
                         @on-change="onRoleChangeLister">
diff --git a/static/excel/批量账户导入.xls b/static/excel/批量账户导入.xls
index 3e333c8dcf6e952628525876148f10c543de1954..22aef2ac721cf490e190db6d88fc1f8123259f36 100644
GIT binary patch
delta 2836
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

delta 3846
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