diff --git a/src/api/flow/index.js b/src/api/flow/index.js index 25bf41d..4816cdd 100644 --- a/src/api/flow/index.js +++ b/src/api/flow/index.js @@ -28,9 +28,9 @@ const groupByUnitTotal=(projectId,deptId)=> { }) } -const groupByProject=()=> { +const groupByProject=(deptId)=> { return request({ - url: `bgscreen/flow/groupByProject`, + url: `bgscreen/flow/groupByProject?deptId=${deptId}`, method: 'get' }) } diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index fc383a1..fec0c92 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -359,8 +359,10 @@ export default { let out = objs.filter(d => d.id == this.project.id); if (out.length == 0) { this.list2 = [{ id: this.project.id, name: this.project.projectName, value: 0, percent: 0, no: '-' }]; + this.label4=`项目审批排名 (0)` } else { this.list2 = out; + this.label4=`项目审批排名 (${out[0].value})` } } else { this.list2 = objs; @@ -529,7 +531,7 @@ export default { this.$api.standard.groupByType({ projectId: this.project?.id || 0, deptId: this.dept?.id || 0 }), this.$api.standard.groupByProject(), this.$api.flow.groupByCategory(this.project?.id || 0, this.dept?.id || 0), - this.$api.flow.groupByProject(), + this.$api.flow.groupByProject(this.dept?.id || 0), this.$api.periodical.getList(), this.$api.flow.groupByUnitTotal(this.project?.id || 0, this.dept?.id || 0), this.$api.flow.groupByUnitFinish(this.project?.id || 0, this.dept?.id || 0),