前后端修改

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -50,7 +50,7 @@
         LEFT JOIN user AS c ON a.creator_id=c.id
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
-        left join report_extra_degree on report_extra_degree.id = report.degree_id
+        left join report_extra_degree on report_extra_degree.id = a.degree_id
         WHERE a.state = 1
         <if test="startDate != null and startDate != ''">
             AND a.create_date between #{startDate} and #{endDate}

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -54,7 +54,7 @@ var addRouFlag = false;
 //角色权限对应关系
 var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","待办任务", "项目管理", "请假管理"]},
             {role:3, modules:["工时报告","工时成本统计","项目报表服务","费用报销","待办任务","项目管理","请假管理"]},
-            {role:4, modules:["工时报告","财务核算成本", "费用报销", "待办任务","组织架构","请假管理"]},
+            {role:4, modules:["财务核算成本", "费用报销", "待办任务","组织架构","请假管理"]},
             {role:5, modules:["工时报告","自动计时","费用报销", "待办任务","项目管理","专业管理","请假管理"]},
             {role:6, modules:["工时报告","工时成本统计","财务核算成本","项目报表服务","费用报销","待办任务","项目管理","请假管理"]},];
 router.beforeEach((to, from, next) => {

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1536,8 +1536,9 @@
                         for(var i in this.auseList) {
                             for(var j in this.ause) {
                                 if(this.auseList[i] == this.ause[j].id) {
-                                    listId.push(this.ause[i].id)
-                                    listName.push(this.ause[i].name)
+                                    listId.push(this.ause[j].id);
+                                    listName.push(this.ause[j].name);
+                                    break;
                                 }
                             }
                         }