From 0e5378fb1ea3e9ec4a1fbb8bc4c7650555e9dce3 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 25 Jun 2019 10:33:21 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=A2=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/login/userlogin.vue    |  4 ++-
 src/views/desk/notice.vue       |  5 +++-
 src/views/monitor/log/api.vue   |  5 +++-
 src/views/monitor/log/error.vue |  9 ++++---
 src/views/monitor/log/usual.vue |  5 +++-
 src/views/system/client.vue     |  5 +++-
 src/views/system/dept.vue       | 17 +++++--------
 src/views/system/dict.vue       | 17 +++++--------
 src/views/system/menu.vue       | 10 +++++---
 src/views/system/param.vue      |  5 +++-
 src/views/system/role.vue       | 45 ++++++++++++++-------------------
 src/views/system/tenant.vue     |  5 +++-
 src/views/system/user.vue       |  5 +++-
 src/views/tool/code.vue         |  5 +++-
 14 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 822ce77..792b464 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -100,8 +100,10 @@
             });
             this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
               this.$router.push({ path: this.tagWel.value });
+              loading.close();
+            }).catch(() => {
+              loading.close()
             });
-            loading.close();
           }
         });
       }
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 02ce8bc..933aeb3 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -40,6 +40,7 @@
     data() {
       return {
         form: {},
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -169,9 +170,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -214,7 +217,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 70b5390..f211c2d 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -25,6 +25,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -104,9 +105,11 @@
     },
     methods: {
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -124,7 +127,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getApiList(page.currentPage, page.pageSize, params).then(res => {
+        getApiList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index 6da5cd3..071c19a 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -25,6 +25,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -111,9 +112,11 @@
     },
     methods: {
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -124,14 +127,14 @@
         }
         done();
       },
-      currentChange(currentPage){
+      currentChange(currentPage) {
         this.page.currentPage = currentPage;
       },
-      sizeChange(pageSize){
+      sizeChange(pageSize) {
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getErrorList(page.currentPage, page.pageSize, params).then(res => {
+        getErrorList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 13743bd..3e79ced 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -25,6 +25,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -103,9 +104,11 @@
     },
     methods: {
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -123,7 +126,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getUsualList(page.currentPage, page.pageSize, params).then(res => {
+        getUsualList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 3b0cc1d..a22592b 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -36,6 +36,7 @@
     data() {
       return {
         form: {},
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -227,9 +228,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -272,7 +275,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 88497fc..f33d3ad 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -29,14 +29,7 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    update,
-    add,
-    getDept,
-    getDeptTree
-  } from "@/api/system/dept";
+  import {add, getDept, getDeptTree, getList, remove, update} from "@/api/system/dept";
   import {mapGetters} from "vuex";
   import website from '@/config/website';
 
@@ -45,6 +38,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -226,9 +220,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -249,9 +245,8 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
-          const data = res.data.data;
-          this.data = data;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          this.data = res.data.data;
           getDeptTree().then(res => {
             const data = res.data.data;
             const index = this.$refs.crud.findColumnIndex("parentId");
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index c10a683..807b939 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -29,14 +29,7 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    update,
-    add,
-    getDict,
-    getDictTree
-  } from "@/api/system/dict";
+  import {add, getDict, getDictTree, getList, remove, update} from "@/api/system/dict";
   import {mapGetters} from "vuex";
 
   export default {
@@ -44,6 +37,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -188,9 +182,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -233,9 +229,8 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
-          const data = res.data.data;
-          this.data = data;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          this.data = res.data.data;
           getDictTree().then(res => {
             const data = res.data.data;
             const index = this.$refs.crud.findColumnIndex("parentId");
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index b7e61de..470f59b 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-  import {getList, remove, update, add, getMenu} from "@/api/system/menu";
+  import {add, getList, getMenu, remove, update} from "@/api/system/menu";
   import {mapGetters} from "vuex";
   import iconList from "@/config/iconList";
 
@@ -44,6 +44,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -290,9 +291,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -335,9 +338,8 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
-          const data = res.data.data;
-          this.data = data;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          this.data = res.data.data;
         });
       }
     }
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index ce646e6..3ebb769 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -37,6 +37,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -146,9 +147,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -183,7 +186,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index bab3997..c199756 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -50,20 +50,11 @@
 </template>
 
 <script>
-import {
-  getList,
-  remove,
-  update,
-  add,
-  grant,
-  grantTree,
-  getRole,
-  getRoleTree
-} from "@/api/system/role";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
+  import {add, getList, getRole, getRoleTree, grant, grantTree, remove, update} from "@/api/system/role";
+  import {mapGetters} from "vuex";
+  import website from '@/config/website';
 
-export default {
+  export default {
   data() {
     return {
       form: {},
@@ -75,11 +66,12 @@ export default {
       list: [],
       defaultObj: [],
       selectionList: [],
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
+      query: {},
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
       option: {
         tip: false,
         tree: true,
@@ -248,11 +240,13 @@ export default {
     },
 
     searchReset() {
-      this.onLoad(this.page);
-    },
-    searchChange(params) {
-      this.onLoad(this.page, params);
-    },
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params) {
+        this.query = params;
+        this.onLoad(this.page, params);
+      },
     selectionChange(list) {
       this.selectionList = list;
     },
@@ -301,9 +295,8 @@ export default {
       this.page.pageSize = pageSize;
     },
     onLoad(page, params = {}) {
-      getList(page.currentPage, page.pageSize, params).then(res => {
-        const data = res.data.data;
-        this.data = data;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        this.data = res.data.data;
         getRoleTree().then(res => {
           const data = res.data.data;
           const index = this.$refs.crud.findColumnIndex("parentId");
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 3376a9a..e1296ee 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -37,6 +37,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -166,9 +167,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -203,7 +206,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index e5eee4b..bb23899 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -79,6 +79,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -325,9 +326,11 @@
           });
       },
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -399,7 +402,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 3447372..f7166ba 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -44,6 +44,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -205,9 +206,11 @@
       },
 
       searchReset() {
+        this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -273,7 +276,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;