From cdf1d776445b9d272410023b919395ee8205f4db Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Sun, 8 Oct 2023 09:27:53 +0800 Subject: [PATCH] code --- src/api/agentcenter/accounting_task.js | 4 +- src/api/agentcenter/task.js | 4 +- src/router/index.js | 4 +- src/views/allTasks/allTasks.vue | 81 +++++++------------------- src/views/processed/processed.vue | 39 ++++++------- src/views/taskAllocation/todo.vue | 36 ++++++------ 6 files changed, 61 insertions(+), 107 deletions(-) diff --git a/src/api/agentcenter/accounting_task.js b/src/api/agentcenter/accounting_task.js index 38a3162..63e73a4 100644 --- a/src/api/agentcenter/accounting_task.js +++ b/src/api/agentcenter/accounting_task.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 待处理任务 -export function todoTaskList(params) { +export function accountingTodoTaskList(params) { return request({ url: '/accounting/task/todoTaskList', method: 'get', @@ -10,7 +10,7 @@ export function todoTaskList(params) { } // 已处理任务 -export function processedTaskList(params) { +export function accountingProcessedTaskList(params) { return request({ url: '/accounting/task/processedTaskList', method: 'get', diff --git a/src/api/agentcenter/task.js b/src/api/agentcenter/task.js index 47a115c..ad20368 100644 --- a/src/api/agentcenter/task.js +++ b/src/api/agentcenter/task.js @@ -1,9 +1,9 @@ import request from '@/utils/request' // 任务 -export function taskList(params) { +export function managerAllTaskList(params) { return request({ - url: '/agentcenter/task/taskList', + url: '/manager/task/allTaskList', method: 'get', params: params, }) diff --git a/src/router/index.js b/src/router/index.js index 18d0d12..0752fc0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -106,7 +106,7 @@ export const constantRoutes = [ component: () => import('@/views/abnormal/abnormal'), hidden: true },*/ - //处理中 +/* //处理中 { path: '/processing', component: () => import('@/views/processing/processing'), @@ -135,7 +135,7 @@ export const constantRoutes = [ path: '/allTasks', component: () => import('@/views/allTasks/allTasks'), hidden: true - }, + },*/ ] // 动态路由，基于用户权限动态去加载 diff --git a/src/views/allTasks/allTasks.vue b/src/views/allTasks/allTasks.vue index 6196db5..5ecddcf 100644 --- a/src/views/allTasks/allTasks.vue +++ b/src/views/allTasks/allTasks.vue @@ -111,33 +111,7 @@ -
-
- -

任务日期

-
- -
- -

{{year}}

- - - -
- -
-

{{index+1}}月

-
- -
+ @@ -149,68 +123,53 @@ import {cityTree, deptTree} from "@/api/misc/misc_dept"; import {ENV} from "@/utils/env"; import {date_format} from "@/utils/date"; -import {taskList} from "@/api/agentcenter/task"; +import {managerAllTaskList} from "@/api/agentcenter/task"; +import RightYearMonthSelector from "@/components/framework/RightYearMonthSelector.vue"; export default { name: "processing", + components: {RightYearMonthSelector}, data() { return { - year: date_format('%Y'), - cityCode: null, - townCode: null, deptOptions: [], - month: date_format('%m'), list: [], total: 0, + parms: { + countyCode: null, + townCode: null, + orderYear: date_format('%Y'), + orderMonth: date_format('%m'), + }, } }, created() { this.getDeptTree(); }, methods:{ - addDate(){ - this.year = Number(this.year) + 1 ; - this.chooseMonth(1); - }, - reduceDate(){ - this.year = Number(this.year) - 1 ; - this.chooseMonth(1); - }, - selectionRange(){ - this.$refs.datePicker.focus(); - }, getDeptTree() { cityTree({rootId: ENV.UserDeptId()}).then((resp) => { this.deptOptions = resp.data; if(this.deptOptions.length) - this.cityCode = this.deptOptions[0].orgCode; + this.parms.countyCode = this.deptOptions[0].orgCode; }); }, getTaskList() { - if(!this.townCode || !this.year || !this.month) + if(!this.parms.townCode || !this.parms.orderYear || !this.parms.orderMonth) return; - taskList({ - townCode: this.townCode, - orderYear: this.year, - orderMonth: this.month, - }).then((resp) => { + managerAllTaskList(this.parms).then((resp) => { this.list = resp.rows; this.total = resp.total; }) }, chooseCity(cmd) { - this.cityCode = cmd; - this.townCode = null; + this.parms.countyCode = cmd; + this.parms.townCode = null; }, chooseTown(cmd) { - this.townCode = cmd; + this.parms.townCode = cmd; this.getTaskList(); }, - isCurrentMonth(m) { - return parseInt(this.month) === m; - }, - chooseMonth(month) { - this.month = month >= 10 ? '' + month : ('0' + month); + chooseMonth(year, month) { this.getTaskList(); }, }, @@ -221,19 +180,19 @@ export default { cityName() { if(!this.deptOptions.length) return ''; - let dept = this.deptOptions.find((x) => x.orgCode === this.cityCode); + let dept = this.deptOptions.find((x) => x.orgCode === this.parms.countyCode); return dept ? dept.deptName : ''; }, townList() { if(!this.deptOptions.length) return []; - let dept = this.deptOptions.find((x) => x.orgCode === this.cityCode); + let dept = this.deptOptions.find((x) => x.orgCode === this.parms.countyCode); return dept ? dept.children || [] : []; }, townName() { if(!this.townList.length) return ''; - let dept = this.townList.find((x) => x.orgCode === this.townCode); + let dept = this.townList.find((x) => x.orgCode === this.parms.townCode); return dept ? dept.deptName : ''; }, }, diff --git a/src/views/processed/processed.vue b/src/views/processed/processed.vue index 91e2a03..27f4a3c 100644 --- a/src/views/processed/processed.vue +++ b/src/views/processed/processed.vue @@ -84,7 +84,7 @@ - + @@ -97,7 +97,7 @@ import RightYearMonthSelector from "@/components/framework/RightYearMonthSelecto import {date, date_format} from "@/utils/date"; import {cityTree} from "@/api/misc/misc_dept"; import {ENV} from "@/utils/env"; -import {processedTaskList} from "@/api/agentcenter/accounting_task"; +import {accountingProcessedTaskList} from "@/api/agentcenter/accounting_task"; export default { name: "processed", @@ -105,13 +105,15 @@ export default { data() { return { deptOptions: [], - cityCode: null, - townCode: null, list: [], total: 0, - year: date_format('%Y'), - month: date_format('%m'), overdue: 0, + parms: { + countyCode: null, + townCode: null, + orderYear: date_format('%Y'), + orderMonth: date_format('%m'), + }, } }, created() { @@ -122,27 +124,22 @@ export default { cityTree({rootId: ENV.UserDeptId()}).then((resp) => { this.deptOptions = resp.data; if(this.deptOptions.length) - this.cityCode = this.deptOptions[0].orgCode; + this.parms.countyCode = this.deptOptions[0].orgCode; }); }, chooseCity(cmd) { - this.cityCode = cmd; - this.townCode = null; + this.parms.countyCode = cmd; + this.parms.townCode = null; this.getTaskList(); }, chooseTown(cmd) { - this.townCode = cmd; + this.parms.townCode = cmd; this.getTaskList(); }, getTaskList() { - if(!this.cityCode || !this.year || !this.month) + if(!this.parms.countyCode || !this.parms.orderYear || !this.parms.orderMonth) return; - processedTaskList({ - countyCode: this.cityCode, - townCode: this.townCode, - orderYear: this.year, - orderMonth: this.month, - }).then((resp) => { + accountingProcessedTaskList(this.parms).then((resp) => { this.list = resp.rows; this.total = resp.total; this.overdue = resp.overdue; @@ -162,21 +159,21 @@ export default { cityName() { if(!this.deptOptions.length) return ''; - let dept = this.deptOptions.find((x) => x.orgCode === this.cityCode); + let dept = this.deptOptions.find((x) => x.orgCode === this.parms.countyCode); return dept ? dept.deptName : ''; }, townList() { if(!this.deptOptions.length) return []; - let dept = this.deptOptions.find((x) => x.orgCode === this.cityCode); + let dept = this.deptOptions.find((x) => x.orgCode === this.parms.countyCode); return [{orgCode: '', deptName: '全部'}, ...(dept ? dept.children || [] : [])]; }, townName() { if(!this.townList.length) return ''; - if(!this.townCode) + if(!this.parms.townCode) return '全部'; - let dept = this.townList.find((x) => x.orgCode === this.townCode); + let dept = this.townList.find((x) => x.orgCode === this.parms.townCode); return dept ? dept.deptName : ''; }, }, diff --git a/src/views/taskAllocation/todo.vue b/src/views/taskAllocation/todo.vue index 8454fcd..009c109 100644 --- a/src/views/taskAllocation/todo.vue +++ b/src/views/taskAllocation/todo.vue @@ -65,7 +65,7 @@ - + @@ -76,7 +76,7 @@