Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -675,6 +675,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
             //获取当前项目的子项目列表，任务分组，任务列表，项目相关维度列表
             reports.forEach(r->{
+                //设置项目名称
+                r.setProjectName(allProjectList.stream().filter(p->p.getId().equals(r.getProjectId())).findFirst().get().getProjectName());
                 r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
                 r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId, r.getStage(), r.getGroupId()));
                 //获取当前项目的工程专业进度

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1509,7 +1509,7 @@ export default {
                             this.canDeleteReport = true
                             let array = [];
                             for (var i in list) {
-                                var projectName = "";
+                                var projectName = list[i].projectName;
                                 var flg = (list[i].isOvertime == 1);
                                 for (var j in this.project) {
                                     if (this.project[j].id == list[i].projectId) {