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

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

@@ -340,6 +340,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     groupEstimatedWorkVOS.add(groupEstimatedWorkVO);
                 }
+            }else {
+                GroupEstimatedWorkVO groupEstimatedWorkVO = new GroupEstimatedWorkVO();
+                groupEstimatedWorkVO.setWorkTime("");
+                groupEstimatedWorkVO.setEstimatedWorkTime("");
+                groupEstimatedWorkVO.setId(null);
+                groupEstimatedWorkVO.setGroupName("");
+                groupEstimatedWorkVO.setProjectId(project.getId());
+                groupEstimatedWorkVO.setProjectName(project.getProjectName());
+                groupEstimatedWorkVOS.add(groupEstimatedWorkVO);
             }
             project.setGroupEstimatedWorkVOList(groupEstimatedWorkVOS);
         }

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

@@ -1193,7 +1193,7 @@
             </el-table>
 
              <!-- 项目预估工时表 -->
-             <el-table  v-if="ins == 27" key="27" border :data="projectEstimatedWorkData" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;" >
+             <el-table  v-if="ins == 27" key="27" border :data="projectEstimatedWorkData" highlight-current-row v-loading="listLoading"  :height="+tableHeight - 1" style="width: 100%;" :span-method="objectSpanMethod">
               <el-table-column align="center" prop="projectName" label="项目名称" min-width="150"></el-table-column>
               <el-table-column align="center" prop="groupName" label="分组名称" min-width="150"></el-table-column>
               <el-table-column align="center" prop="estimatedWorkTime" label="预估工时" min-width="150"></el-table-column>
@@ -2282,6 +2282,10 @@ export default {
           dept ? sl.deptId = dept : ''
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
+        }else if(this.ins == 27) {
+          fName = '项目预估工时表' + '.xlsx'
+          url = "/project/exportProjectEstimatedWorkTime"
+          this.proJuctId ? sl.projectId = this.proJuctId : ''
         }
           this.http.post(url, sl,
             res => {
@@ -3817,6 +3821,8 @@ export default {
       let { data } = await this.postData('/project/getProjectEstimatedWork', {
         ...parameter
       })
+      this.resetMerge()
+      this.rowspan(this.listArr1, this.listPosition1, 'projectId', data.records)
       this.projectEstimatedWorkData = data.records
       this.total = data.total
       this.listLoading = false