Browse Source

调整获取分组负责人的判断

Lijy 2 years ago
parent
commit
665ddc005e

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -480,7 +480,7 @@
                             </el-select>
                             </el-select>
                         </el-form-item>
                         </el-form-item>
                         <el-form-item :label="user.companyId==781? $t('other.reviewer') : $t('other.projectAuditor')" v-if="user.timeType.reportAuditType != 3">
                         <el-form-item :label="user.companyId==781? $t('other.reviewer') : $t('other.projectAuditor')" v-if="user.timeType.reportAuditType != 3">
-
+                            
                             <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()" v-if="user.userNameNeedTranslate != '1'" style="width:200px;">
                             <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()" v-if="user.userNameNeedTranslate != '1'" style="width:200px;">
                                 <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
                                 <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
                                     <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
                                     <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
@@ -3520,7 +3520,7 @@
                         });
                         });
                     });
                     });
                 //检查当前的项目是否需要获取分组的负责人
                 //检查当前的项目是否需要获取分组的负责人
-                if (this.user.timeType.reportAuditType == 1 && this.user.timeType.reportAuditType == 2 ) {
+                if (this.user.timeType.reportAuditType == 1 || this.user.timeType.reportAuditType == 2 ) {
                     this.http.post("/task-group/getGroupIncharger", {groupId: domain.groupId},
                     this.http.post("/task-group/getGroupIncharger", {groupId: domain.groupId},
                         res => {
                         res => {
                             if (res.code == "ok") {
                             if (res.code == "ok") {