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

---
 src/views/desk/notice.vue       |  8 +++++---
 src/views/flow/follow.vue       |  4 +++-
 src/views/flow/manager.vue      |  4 +++-
 src/views/flow/model.vue        |  4 +++-
 src/views/monitor/log/api.vue   |  4 +++-
 src/views/monitor/log/error.vue |  4 +++-
 src/views/monitor/log/usual.vue |  4 +++-
 src/views/resource/oss.vue      |  4 +++-
 src/views/system/client.vue     |  4 +++-
 src/views/system/dept.vue       |  7 ++++---
 src/views/system/dict.vue       | 11 ++++++-----
 src/views/system/menu.vue       |  4 +++-
 src/views/system/param.vue      |  4 +++-
 src/views/system/role.vue       | 18 +++++-------------
 src/views/system/tenant.vue     |  4 +++-
 src/views/system/user.vue       |  4 +++-
 src/views/work/claim.vue        |  4 +++-
 src/views/work/done.vue         |  4 +++-
 src/views/work/send.vue         |  4 +++-
 src/views/work/start.vue        |  4 +++-
 src/views/work/todo.vue         |  4 +++-
 21 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index b93c76a..23a199b 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,
@@ -189,6 +190,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -224,10 +226,10 @@
         }
         done();
       },
-      currentChange(currentPage){
+      currentChange(currentPage) {
         this.page.currentPage = currentPage;
       },
-      sizeChange(pageSize){
+      sizeChange(pageSize) {
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
@@ -243,7 +245,7 @@
           }
           values.releaseTimeRange = null;
         }
-        getList(page.currentPage, page.pageSize, values).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index f132f8b..2be0a22 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -50,6 +50,7 @@
         selectionId: '',
         processInstanceId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -150,6 +151,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -162,7 +164,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        followList(page.currentPage, page.pageSize, params).then(res => {
+        followList(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/flow/manager.vue b/src/views/flow/manager.vue
index 670d799..bd73b7b 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -115,6 +115,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -221,6 +222,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -310,7 +312,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        managerList(page.currentPage, page.pageSize, values).then(res => {
+        managerList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue
index 5f48001..d801ab6 100644
--- a/src/views/flow/model.vue
+++ b/src/views/flow/model.vue
@@ -124,6 +124,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -199,6 +200,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -294,7 +296,7 @@
         this.page.pageSize = pageSize;
       },
       onLoad(page, params = {}) {
-        modelList(page.currentPage, page.pageSize, params).then(res => {
+        modelList(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..59eb2b9 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,
@@ -107,6 +108,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -124,7 +126,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..16c7ecc 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,
@@ -114,6 +115,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -131,7 +133,7 @@
         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..80d0f64 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,
@@ -106,6 +107,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       beforeOpen(done, type) {
@@ -123,7 +125,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/resource/oss.vue b/src/views/resource/oss.vue
index 8b8321a..c747568 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -54,6 +54,7 @@
     data() {
       return {
         form: {},
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -218,6 +219,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -278,7 +280,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/client.vue b/src/views/system/client.vue
index 3b0cc1d..6a62440 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,
@@ -230,6 +231,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -272,7 +274,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 db6b9c6..75c4b1b 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -49,6 +49,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -249,6 +250,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -269,9 +271,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..ef0b2b1 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -44,6 +44,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -191,6 +192,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -226,16 +228,15 @@
         }
         done();
       },
-      currentChange(currentPage){
+      currentChange(currentPage) {
         this.page.currentPage = currentPage;
       },
-      sizeChange(pageSize){
+      sizeChange(pageSize) {
         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 bbb06f1..be00a6a 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -80,6 +80,7 @@
       return {
         form: {},
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -434,6 +435,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -590,7 +592,7 @@
           ...params,
           menuId: this.scopeMenuId,
         }
-        getListScope(page.currentPage, page.pageSize, values).then(res => {
+        getListScope(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.pageScope.total = data.total;
           this.dataScope = data.records;
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index ce646e6..f3a5c63 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,
@@ -149,6 +150,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -183,7 +185,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 f871d49..fc026ba 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -65,16 +65,7 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    update,
-    add,
-    grant,
-    grantTree,
-    getRole,
-    getRoleTree,
-  } from "@/api/system/role";
+  import {add, getList, getRole, getRoleTree, grant, grantTree, remove, update,} from "@/api/system/role";
   import {mapGetters} from "vuex";
   import website from '@/config/website';
 
@@ -93,6 +84,7 @@
         menuTreeObj: [],
         scopeTreeObj: [],
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -270,6 +262,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -322,9 +315,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;
           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 554c621..b2aea84 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,
@@ -169,6 +170,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -203,7 +205,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 b525318..95ede1c 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,
@@ -328,6 +329,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -399,7 +401,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/work/claim.vue b/src/views/work/claim.vue
index 2fd299d..b9089e6 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -73,6 +73,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -148,6 +149,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -188,7 +190,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        claimList(page.currentPage, page.pageSize, values).then(res => {
+        claimList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/work/done.vue b/src/views/work/done.vue
index 9e3255a..d1926a2 100644
--- a/src/views/work/done.vue
+++ b/src/views/work/done.vue
@@ -66,6 +66,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -141,6 +142,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -164,7 +166,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        doneList(page.currentPage, page.pageSize, values).then(res => {
+        doneList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/work/send.vue b/src/views/work/send.vue
index c183625..5361e66 100644
--- a/src/views/work/send.vue
+++ b/src/views/work/send.vue
@@ -70,6 +70,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -151,6 +152,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -174,7 +176,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        sendList(page.currentPage, page.pageSize, values).then(res => {
+        sendList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index 1465435..8f050ae 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -74,6 +74,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -154,6 +155,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -177,7 +179,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        startList(page.currentPage, page.pageSize, values).then(res => {
+        startList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue
index 162f03b..236182b 100644
--- a/src/views/work/todo.vue
+++ b/src/views/work/todo.vue
@@ -73,6 +73,7 @@
         form: {},
         selectionId: '',
         selectionList: [],
+        query: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -148,6 +149,7 @@
         this.onLoad(this.page);
       },
       searchChange(params) {
+        this.query = params;
         this.onLoad(this.page, params);
       },
       selectionChange(list) {
@@ -174,7 +176,7 @@
           ...params,
           category: (params.category) ? flowCategory(params.category) : null
         }
-        todoList(page.currentPage, page.pageSize, values).then(res => {
+        todoList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;