diff --git a/src/api/agentcenter/task.js b/src/api/agentcenter/task.js
index ad20368..80e1a3d 100644
--- a/src/api/agentcenter/task.js
+++ b/src/api/agentcenter/task.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 任务
+// 全部任务
export function managerAllTaskList(params) {
return request({
url: '/manager/task/allTaskList',
@@ -8,3 +8,21 @@ export function managerAllTaskList(params) {
params: params,
})
}
+
+// 区总览
+export function managerCountyTaskSummary(params) {
+ return request({
+ url: '/manager/task/countyTaskSummary',
+ method: 'get',
+ params: params,
+ })
+}
+
+// 待分配任务
+export function managerUndistribTaskList(params) {
+ return request({
+ url: '/manager/task/undistribTaskList',
+ method: 'get',
+ params: params,
+ })
+}
diff --git a/src/components/framework/RightYearMonthHorizontalSelector.vue b/src/components/framework/RightYearMonthHorizontalSelector.vue
new file mode 100644
index 0000000..f03eb1f
--- /dev/null
+++ b/src/components/framework/RightYearMonthHorizontalSelector.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
{{title || '任务日期'}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/allTasks/allTasks.vue b/src/views/allTasks/allTasks.vue
index 5ecddcf..05790f7 100644
--- a/src/views/allTasks/allTasks.vue
+++ b/src/views/allTasks/allTasks.vue
@@ -31,11 +31,11 @@
-
镇处理进度:15/50
- 镇审核进度:5/50
- 合作社处理进度:25/70
- 合作社审核进度:10/70
- 任务异常数:1个
+ 镇处理进度:{{ countySummary.numTownProcessedTask }}/{{ countySummary.numTown }}
+ 镇审核进度:{{ countySummary.numTownApprovalTask }}/{{ countySummary.numTown }}
+ 合作社处理进度:{{ countySummary.numBookProcessedTask }}/{{ countySummary.numBook }}
+ 合作社审核进度:{{ countySummary.numBookApprovalTask }}/{{ countySummary.numBook }}
+ 任务异常数:{{countySummary.abnormalCount}}个
@@ -54,7 +54,7 @@
-
+
@@ -71,7 +71,7 @@
记账:{{task.voucherCount}}
合同:{{task.contracCount}}
其他:{{task.allCount - task.voucherCount - task.contracCount}}
- 进入账套
+ 进入账套
@@ -100,8 +100,8 @@
- 未完成
- 已完成
+ 未完成
+ 已完成
@@ -123,7 +123,7 @@
import {cityTree, deptTree} from "@/api/misc/misc_dept";
import {ENV} from "@/utils/env";
import {date_format} from "@/utils/date";
-import {managerAllTaskList} from "@/api/agentcenter/task";
+import {managerAllTaskList, managerCountyTaskSummary,} from "@/api/agentcenter/task";
import RightYearMonthSelector from "@/components/framework/RightYearMonthSelector.vue";
export default {
@@ -140,6 +140,15 @@ export default {
orderYear: date_format('%Y'),
orderMonth: date_format('%m'),
},
+ countySummary: {
+ numTown: 0,
+ numBook: 0,
+ abnormalCount: 0,
+ numTownProcessedTask: 0,
+ numTownApprovalTask: 0,
+ numBookProcessedTask: 0,
+ numBookApprovalTask: 0,
+ }
}
},
created() {
@@ -150,11 +159,15 @@ export default {
cityTree({rootId: ENV.UserDeptId()}).then((resp) => {
this.deptOptions = resp.data;
if(this.deptOptions.length)
+ {
this.parms.countyCode = this.deptOptions[0].orgCode;
+ this.getSummary();
+ this.getTaskList();
+ }
});
},
getTaskList() {
- if(!this.parms.townCode || !this.parms.orderYear || !this.parms.orderMonth)
+ if(!this.parms.countyCode || !this.parms.orderYear || !this.parms.orderMonth)
return;
managerAllTaskList(this.parms).then((resp) => {
this.list = resp.rows;
@@ -164,14 +177,27 @@ export default {
chooseCity(cmd) {
this.parms.countyCode = cmd;
this.parms.townCode = null;
+ this.getTaskList();
+ this.getSummary();
},
chooseTown(cmd) {
this.parms.townCode = cmd;
this.getTaskList();
},
chooseMonth(year, month) {
+ this.getSummary();
this.getTaskList();
},
+ gotoRemoteSite(task) {
+ window.open(`/api/open/book/${task.orgCode}/${task.bookId}`, '_blank');
+ },
+ getSummary() {
+ if(!this.parms.countyCode || !this.parms.orderYear || !this.parms.orderMonth)
+ return;
+ managerCountyTaskSummary(this.parms).then((resp) => {
+ this.countySummary = resp.data;
+ })
+ }
},
mounted(){
diff --git a/src/views/taskAllocation/todo.vue b/src/views/taskAllocation/todo.vue
index 009c109..59cc69b 100644
--- a/src/views/taskAllocation/todo.vue
+++ b/src/views/taskAllocation/todo.vue
@@ -24,14 +24,12 @@
{{townName}}
{{item.deptName}}
-
2023.03.05
diff --git a/src/views/toBeAllocated/toBeAllocated.vue b/src/views/toBeAllocated/toBeAllocated.vue
index a5f096d..61dd38c 100644
--- a/src/views/toBeAllocated/toBeAllocated.vue
+++ b/src/views/toBeAllocated/toBeAllocated.vue
@@ -6,12 +6,12 @@
-
-
-
张家镇
+
+
@@ -20,42 +20,43 @@
-
-
-
张家镇
+
+
-
已处理村庄:19个
-
超时完成村庄:1个
+
待处理镇/街:{{total}}个
+
待处理村庄:{{numVillage}}个
+
待处理任务:{{allCount}}个
-
+
-
-
-
-
+
+
+
+
- 5 7
+ {{scope.row.voucherCount}} 7
-
-
-
-
+
+
+
+
@@ -64,24 +65,24 @@
-
+
-
-
-
-
+
+
+
+
- 5 7
+ {{scope.row.voucherCount}} 7
-
-
-
-
+
+
+
+
@@ -89,40 +90,13 @@
-
+
-
+
@@ -133,14 +107,14 @@
- 姓名
- 未完成
- 任务期限
+ 姓名
+ 未完成
+ 任务期限
- 张三
- 19 110
-
+ 张三
+ 19 110
+
未选中
-
@@ -162,64 +136,53 @@
@@ -450,6 +444,13 @@
}
}
.todo_num2{
+ margin-left: 2vw;
+ span{
+ font-size: 24px;
+ color: #3976ff;
+ }
+ }
+ .todo_num3{
margin-left: 2vw;
span{
font-size: 24px;