调整日报审核人为4的情况

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

@@ -3413,7 +3413,7 @@
                 //获取项目下的任务分组
                 this.getTaskGroups(domain, index);
                 //获取项目审核人
-                if (this.user.timeType.reportAuditType == 0) {
+                if (this.user.timeType.reportAuditType == 0 || this.user.timeType.reportAuditType == 4) {
                     this.getProjectAuditorList(domain, index);
                 } else {
                     //按分组的负责人来审核
@@ -3520,7 +3520,7 @@
                         });
                     });
                 //检查当前的项目是否需要获取分组的负责人
-                if (this.user.timeType.reportAuditType >= 1 && this.user.timeType.reportAuditType != 3) {
+                if (this.user.timeType.reportAuditType == 1 && this.user.timeType.reportAuditType == 2 ) {
                     this.http.post("/task-group/getGroupIncharger", {groupId: domain.groupId},
                         res => {
                             if (res.code == "ok") {
@@ -6265,7 +6265,7 @@
                             } else {
                                 // console.log('执行到了这里')
                                 // console.log(this.user.timeType.reportAuditType)
-                                if (this.user.timeType.reportAuditType == 0) {
+                                if (this.user.timeType.reportAuditType == 0 || this.user.timeType.reportAuditType == 4) {
                                     this.$message({
                                         message: this.$t('message.Pleasespecifyaprojectreviewer'),
                                         type: "error"

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

@@ -67,7 +67,7 @@
                             @cancel="item.showPickerSubProject = false;$forceUpdate();" />
                     </van-popup>
                     <!--任务分组 -->
-                    <van-field  readonly  name="groupId" v-if="user.timeType.reportAuditType >= 1 || (user.company.packageProject==1&&item.taskGroups != null && item.taskGroups.length > 0)" clickable 
+                    <van-field  readonly  name="groupId" v-if="user.timeType.reportAuditType >= 1 && (user.company.packageProject == 1 && item.taskGroups != null && item.taskGroups.length > 0)" clickable 
                         :value="item.groupName" label="任务分组" placeholder="请选择任务分组" 
                     @click="clickPickTaskGroup(index, item)" />
                     <van-popup v-model="item.showPickerTaskGroup" position="bottom">
@@ -761,7 +761,7 @@ import timetoolVue from '../timetool/timetool.vue';
                 //获取项目审核人
                 // console.log(domainItem.projectId,this.project);
                 var curProject = this.project.filter(p=>p.id == domainItem.projectId)[0];
-                if (curProject && this.user.timeType.reportAuditType == 0) {
+                if (curProject && (this.user.timeType.reportAuditType == 0 || this.user.timeType.reportAuditType == 4)) {
                     this.getProjectAuditorList(domainItem, index);
                 }
 
@@ -1521,7 +1521,7 @@ import timetoolVue from '../timetool/timetool.vue';
                 
                 //检查当前的项目是否需要获取分组的负责人
                 var curProject = this.project.filter(p=>p.id == this.form.domains[this.clickIndex].projectId)[0];
-                if (curProject && this.user.timeType.reportAuditType >= 1) {
+                if (curProject && this.user.timeType.reportAuditType == 1 && this.user.timeType.reportAuditType == 2) {
                     this.$axios.post("/task-group/getGroupIncharger", {groupId: domainItem.groupId})
                     .then(res => {
                         if(res.code == "ok") {