1. 完成任务时，只针对需要审核的文件进行审核通过校验

2，针对部门审核作为最后一个节点的情况，只有部门的负责人才可以撤回。

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

@@ -2816,8 +2816,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<Integer> manProjectIds = null;
             //判断查看权限
             List<Integer> filterDeptIds=null;
-            //针对威派格，部门的主要和其他负责人需要查看部门下人员负责的项目或者项目下的任务分组的工时
-            boolean containDeptMembInchargeProjects = targetUser.getCompanyId() == 936;
             List<String> inchargeUserIds = null;
             if(deptId!=null){
                 filterDeptIds= getBranchDepartment(deptId, allDepartmentList);
@@ -2842,9 +2840,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     if(functionTimeList.size()>0||functionCostList.size()>0){
                         deptIds.addAll(allMyManagedDeptIds);
                     }
-                    if (containDeptMembInchargeProjects && deptIds.size() > 1) {
-                        inchargeUserIds = userMapper.selectList(new QueryWrapper<User>().select("id").in("department_id", deptIds)).stream().map(User::getId).collect(Collectors.toList());
-                    }
                 } else {
                     //担任项目经理的项目
                     List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").eq("incharger_id", targetUser.getId()));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -555,7 +555,7 @@ public class TaskController {
                 return msg;
             } else {
                 cnt = taskFilesMapper.selectCount(new QueryWrapper<TaskFiles>().eq("task_id",task.getId())
-                        .eq("final_charge_status",0).ne("charge_one_status",2).ne("charge_two_status",2));
+                        .eq("final_charge_status",0).eq("need_file_charge", 1).ne("charge_one_status",2).ne("charge_two_status",2));
                 if (cnt > 0) {
                     msg.setError("当前任务存在尚未审核通过的成果附件，不可完成");
                     return msg;

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -1071,14 +1071,7 @@ export default {
     this.gstimhour = [this.user.timeType.allday]
     this.gstimday = [1]
     this.getSapServiceList()
-
     this.timess();
-
-    if(this.showMmeiLaiDe) {
-        this.getPmUserList()
-        this.setDisabledPermission()
-    }
-
     setTimeout(() => {
         console.log(this.addForm)
     }, 5000)
@@ -1232,11 +1225,7 @@ export default {
     triggerEvent(obj) {
         console.log(obj, '触发事件')
         this.curProjectId = obj.curProjectId
-        if(!this.showMmeiLaiDe) {
-            this.getProjectList()
-        } else {
-            this.getProjectListTwo()
-        }
+        this.getProjectList()
         if(!obj.taskVue) {
             this.getStageList(obj.integrationTaskNingwai)
         }
@@ -1286,12 +1275,14 @@ export default {
             this.getTaskFileList(obj.num,obj.id)
             const { integrationTaskNingwai = {} } = obj
             if(integrationTaskNingwai.groupId) {
+                this.addForm.groupId = integrationTaskNingwai.groupId
                 this.getTaskGrouping(obj.curProjectId)
             }
             setTimeout(() => {
                 this.getTaskDetail(obj.id);
             }, 200)
         }
+        console.log('groupId========', this.addForm.groupId);
         this.getrelation();
     },
     // 代办任务创建事件
@@ -1301,9 +1292,6 @@ export default {
             this.addForm.stagesId = ''
             this.getTaskGrouping()
             this.getrelation();
-            if(this.showMmeiLaiDe) {
-                this.getProjectManager()
-            }
         } else if(num == 2) {
             this.addForm.stagesId = ''
             this.getTaskList()
@@ -2220,7 +2208,7 @@ export default {
 
         //获取选择关联列表
         this.http.post('/task/getTaskOnlyList',{
-            projectId: this.curProjectId?this.curProjectId:this.addForm.projectId
+            projectId: this.curProjectId?this.curProjectId:this.addForm.projectId, groupId: this.addForm.groupId
         },
         res => {
             if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -268,7 +268,7 @@
                                                         size="small" @click="approve(item1.id, item2)">{{$t('btn.through')}}</el-button>
                                                         <el-button v-if="item2.state == 0 && (((permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.isDeptAudit==0 && item2.projectAuditState==0) || (item2.isDeptAudit==1 && item2.auditDeptManagerid == user.id))" type="danger" :loading="logining" 
                                                         size="small" @click="showDenyDialog(item1.id,0, item2)">{{$t('btn.rejected')}}</el-button>
-                                                        <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId || ((user.timeType.reportAuditType== 5 || user.timeType.reportAuditType== 6)&& (user.id == item2.projectAuditorId || (item2.isDeptAudit == 1 && user.id == item2.auditDeptManagerid)))) && item2.state == 1" type="normal" :loading="logining" size="small" 
+                                                        <el-button v-if="(permissions.projectReportReview ||((item2.isDeptAudit == 0 && user.id == item2.projectAuditorId) || (item2.isDeptAudit == 1 && user.id == item2.auditDeptManagerid)) || ((user.timeType.reportAuditType== 5 || user.timeType.reportAuditType== 6)&& (user.id == item2.projectAuditorId || (item2.isDeptAudit == 1 && user.id == item2.auditDeptManagerid)))) && item2.state == 1" type="normal" :loading="logining" size="small" 
                                                         @click="showDenyDialog(item1.id,1, item2)">{{$t('btn.undo')}}</el-button>
                                                         <!--自己可以撤回待审核状态的报告 -->
                                                         <el-button v-if="user.id == item1.id && (item2.state == 0 || item2.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">{{$t('btn.withdraw')}}</el-button>