From 0c826cfd1e8cad512a743b00f13b69d39e987e23 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Wed, 22 Apr 2020 15:16:37 +0800
Subject: [PATCH] ni

---
 src/pages/Home.vue                      |  3 +-
 src/pages/shop/IncreaseDataCompany.vue  |  2 +-
 src/pages/shop/IncreaseDataStaff.vue    | 55 ++++++++++++++++++++-----
 src/pages/shop/IncreaseDataStore.vue    | 44 ++++++++++++++++----
 src/pages/shop/IncreaseStoreManager.vue |  2 +-
 src/pages/user/AccountManager.vue       | 35 +++++++++++++++-
 6 files changed, 118 insertions(+), 23 deletions(-)

diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 4d83484..8bb90ad 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -53,7 +53,7 @@
             return {
                 isCollapsed: false,
                 mHeight: 600,
-                selectedItemName: 0,
+                selectedItemName: null,
                 openName: [],
                 selectedMenu: '',
                 selectedSubMenu: '',
@@ -244,6 +244,7 @@
             },
             //账户管理页面回调方法
             callBack() {
+                debugger
                 let that = this;
                 this.selectedMenu = "设置管理";
                 this.selectedSubMenu = "账户管理";
diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 8c83ac7..2ad6b6f 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -11,7 +11,7 @@
                                     style="width: 200px"></DatePicker>
                     </i-col>
                     <i-col span="2" style="text-align: right;">
-                        <span class="region">零售公司选择</span>
+                        <span class="region">零售公司</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedCompany" filterable style="width: 200px;">
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 0ca369f..174096f 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -10,7 +10,7 @@
                         <DatePicker @on-change="onChangeDateLister" :value="selectDate"  type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker>
                     </i-col>
                     <i-col span="2" style="text-align: right;">
-                        <span class="region">零售公司选择</span>
+                        <span class="region">零售公司</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedCompany"  @on-change="storeOfCompany" filterable style="width: 200px;">
@@ -18,7 +18,7 @@
                         </Select>
                     </i-col>
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">店铺选择</span>
+                        <span class="region">店铺</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStore" filterable style="width: 200px;" @on-change="sellerOfStore">
@@ -27,7 +27,7 @@
                     </i-col>
 
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">导购选择</span>
+                        <span class="region">导购</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStaff" filterable style="width: 200px;">
@@ -146,7 +146,10 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.companyList = data.results;
+                        that.companyList.push({id:'-1',name:"全部"});
+                        data.results.forEach(da => {
+                            that.companyList.push(da);
+                        })
                     }
                 })
             },
@@ -163,7 +166,13 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.storeList = data.results;
+                        that.storeList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.storeList.push(da);
+                        })
                     }
                 })
             },
@@ -180,15 +189,25 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.staffList = data.results;
+                        that.staffList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.staffList.push(da);
+                        })
                     }
                 })
             },
             storeOfCompany(){
                 let that = this;
                 this.selectedStore = "";
+                let orgId = this.selectedCompany;
+                if(this.selectedCompany === "-1"){
+                    orgId = null;
+                }
                 let request = {
-                    orgId:this.selectedCompany
+                    orgId:orgId
                 };
                 this.storeList = [];
                 IncreaseData.listOfStoreByCompany(request,function (data) {
@@ -198,15 +217,25 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.storeList = data.results;
+                        that.storeList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.storeList.push(da);
+                        })
                     }
                 })
             },
             sellerOfStore(){
                 let that = this;
                 this.selectedStaff = "";
+                let shopId = this.selectedStore;
+                if(this.selectedStore === '-1'){
+                    shopId = null;
+                }
                 let request = {
-                    shopId:this.selectedStore
+                    shopId:shopId
                 };
                 this.staffList = [];
                 IncreaseData.listOfSellerByStore(request,function (data) {
@@ -216,7 +245,13 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.staffList = data.results;
+                        that.staffList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.staffList.push(da);
+                        })
                     }
                 })
             },
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index e92cdf1..3c07d4c 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -10,7 +10,7 @@
                         <DatePicker @on-change="onChangeDateLister" :value="selectDate" type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker>
                     </i-col>
                     <i-col span="2" style="text-align: right;">
-                        <span class="region">零售公司选择</span>
+                        <span class="region">零售公司</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedCompany" filterable style="width: 200px;" @on-change="storeOfCompany">
@@ -18,7 +18,7 @@
                         </Select>
                     </i-col>
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">店铺选择</span>
+                        <span class="region">店铺</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStore" filterable style="width: 200px;">
@@ -130,7 +130,10 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.companyList = data.results;
+                        that.companyList.push({id:'-1',name:"全部"});
+                        data.results.forEach(da => {
+                            that.companyList.push(da);
+                        })
                     }
                 })
             },
@@ -147,15 +150,26 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.storeList = data.results;
+                        that.storeList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.storeList.push(da);
+                        })
                     }
                 })
             },
             storeOfCompany(){
                 this.selectedStore = null;
+                debugger
                 let that = this;
+                let orgId = this.selectedCompany;
+                if(this.selectedCompany === "-1"){
+                    orgId = null;
+                }
                 let request = {
-                    orgId:this.selectedCompany
+                    orgId:orgId
                 };
                 this.storeList = [];
                 IncreaseData.listOfStoreByCompany(request,function (data) {
@@ -165,7 +179,13 @@
                         return;
                     }
                     if (data.code === '0000') {
-                        that.storeList = data.results;
+                        that.storeList.push({
+                            id:'-1',
+                            name:"全部"
+                        })
+                        data.results.forEach(da => {
+                            that.storeList.push(da);
+                        })
                     }
                 })
             },
@@ -174,11 +194,19 @@
                     this.$Message.info("请选择日期");
                     return
                 }
+                let orgId = this.selectedCompany;
+                if(this.selectedCompany === "-1"){
+                    orgId = null;
+                }
+                let shopId = this.selectedStore;
+                if(this.selectedStore === "-1"){
+                    shopId = null;
+                }
                 let request = {
                     startTime:this.selectDate[0],
                     endTime:this.selectDate[1],
-                    orgId:this.selectedCompany,
-                    shopId:this.selectedStore,
+                    orgId:orgId,
+                    shopId:shopId,
                     pageNum:this.pageNum,
                     pageSize:this.pageSize,
                 };
diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue
index 1f695aa..697de4e 100644
--- a/src/pages/shop/IncreaseStoreManager.vue
+++ b/src/pages/shop/IncreaseStoreManager.vue
@@ -16,7 +16,7 @@
                         </Select>
                     </i-col>
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">店铺选择</span>
+                        <span class="region">店铺</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStore" filterable style="width: 200px;">
diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue
index ea9a456..253144e 100644
--- a/src/pages/user/AccountManager.vue
+++ b/src/pages/user/AccountManager.vue
@@ -47,6 +47,10 @@
             return {
                 modal13: false,
                 roleList: [
+                    {
+                        id: '0',
+                        name: '全部',
+                    },
                     {
                         id: '1',
                         name: '系统管理员',
@@ -188,6 +192,8 @@
                 this.bus.$emit('callBack');
             }
             this.listAccountInfoFunction();
+            // 绑定enter事件
+            this.enterKeyup();
         },
         methods: {
             //切页处理
@@ -217,6 +223,10 @@
                     }
                     if (data.code === '0000') {
                         data = data.results;
+                        that.roleList.push({
+                            id:0,
+                            name:"全部"
+                        });
                         for (let i = 0; i < data.length; i++) {
                             let row = data[i];
                             that.roleList.push(row);
@@ -250,11 +260,15 @@
             listAccountInfoFunction: function () {
                 let that = this;
                 that.data1 = [];
+                let roleId = that.changeRoleId;
+                if(that.changeRoleId === 0){
+                    roleId = null;
+                }
                 let request = {
                     searchContent: that.searchContent,
                     pageNum: that.pageNum,
                     pageSize: that.pageSize,
-                    roleId: that.changeRoleId,
+                    roleId: roleId,
                     shopId: that.changeShopId
                 };
                 accountManagement.listAccountInfoApi(request, function (data) {
@@ -320,7 +334,24 @@
             ok() {
                 this.modal13 = false;
                 this.remove();
-            }
+            },
+            enterKeyup() {
+                document.addEventListener("keyup", this.buttonOperation);
+            },
+            buttonOperation() {
+                const code = event.keyCode
+                    ? event.keyCode
+                    : event.which
+                        ? event.which
+                        : event.charCode;
+                if (code === 13) {
+                    this.pageNum = 1;
+                    this.listAccountInfoFunction();
+                }else if (code !== 13 && code === 1) {
+                    this.pageNum = 1;
+                    this.listAccountInfoFunction();
+                }
+            },
         },
 
     }