diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue index 94c16e3..0a19f89 100644 --- a/src/views/work/claim.vue +++ b/src/views/work/claim.vue @@ -201,12 +201,12 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const values = { - ...params, + const query = { + ...this.query, category: (params.category) ? flowCategory(params.category) : null - } + }; this.loading = true; - claimList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => { + claimList(page.currentPage, page.pageSize, Object.assign(params, 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 3f0f7d9..13724de 100644 --- a/src/views/work/done.vue +++ b/src/views/work/done.vue @@ -177,12 +177,12 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const values = { - ...params, + const query = { + ...this.query, category: (params.category) ? flowCategory(params.category) : null - } + }; this.loading = true; - doneList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => { + doneList(page.currentPage, page.pageSize, Object.assign(params, 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 2f4c1b6..5174afe 100644 --- a/src/views/work/send.vue +++ b/src/views/work/send.vue @@ -187,12 +187,12 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const values = { - ...params, + const query = { + ...this.query, category: (params.category) ? flowCategory(params.category) : null - } + }; this.loading = true; - sendList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => { + sendList(page.currentPage, page.pageSize, Object.assign(params, 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 c77ca65..d0805fe 100644 --- a/src/views/work/start.vue +++ b/src/views/work/start.vue @@ -190,12 +190,12 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const values = { - ...params, + const query = { + ...this.query, category: (params.category) ? flowCategory(params.category) : null - } + }; this.loading = true; - startList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => { + startList(page.currentPage, page.pageSize, Object.assign(params, 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 a0836a9..131f963 100644 --- a/src/views/work/todo.vue +++ b/src/views/work/todo.vue @@ -187,12 +187,12 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const values = { - ...params, + const query = { + ...this.query, category: (params.category) ? flowCategory(params.category) : null - } + }; this.loading = true; - todoList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => { + todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => { const data = res.data.data; this.page.total = data.total; this.data = data.records;