复审人

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -483,6 +483,9 @@ public class Project extends Model<Project> {
     @TableField("reviwer_id")
     private String reviwerId;
 
+    @TableField(exist = false)
+    private String reviwerName;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -2305,6 +2305,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 project.setInchargerName(incharger.getName());
             }
         }
+        if (project.getReviwerId() != null) {
+            User reviewer = userMapper.selectById(project.getReviwerId());
+            if (reviewer != null) {
+                project.setReviwerName(reviewer.getName());
+            }
+        }
         Optional<Department> first = departmentList.stream().filter(dt -> dt.getDepartmentId().equals(project.getDeptId())).findFirst();
         if(first.isPresent()){
             project.setDepartmentName(first.get().getDepartmentName());

fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -122,8 +122,13 @@
                         <span v-if="user.userNameNeedTranslate != 1">{{project.inchargerName}}</span>
                         <span v-else><TranslationOpenDataText type='userName' :openid='project.inchargerName'></TranslationOpenDataText></span>
                     </el-link></div>
-                    <div style="margin-top:10px;color:#999;">{{ user.timeType.reportCc == 1?'日报抄送人':$t('newspaperauditor') }}</div>
-                    <div>
+                    <div v-if="user.timeType.reportAuditType == 8" style="margin-top:10px;color:#999;">{{ $t('other.projectReviwer') }}</div>
+                    <div v-if="user.timeType.reportAuditType == 8"><el-link style="margin:10px" @click="showUser(project.reviwerId)">
+                        <span v-if="user.userNameNeedTranslate != 1">{{project.reviwerName}}</span>
+                        <span v-else><TranslationOpenDataText type='userName' :openid='project.reviwerName'></TranslationOpenDataText></span>
+                    </el-link></div>
+                    <div v-if="user.timeType.reportAuditType != 8" style="margin-top:10px;color:#999;">{{ user.timeType.reportCc == 1?'日报抄送人':$t('newspaperauditor') }}</div>
+                    <div v-if="user.timeType.reportAuditType != 8">
                         <span v-if="project.auditorList.length == 0" style="margin:10px;">-</span>
                         <el-link v-for="item in project.auditorList" :key="item.id" style="margin:10px;" @click="showUser(item.auditorId)">
                             <span v-if="user.userNameNeedTranslate != 1">

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

@@ -992,7 +992,7 @@
             },
             // 获取项目
             getPeoject() {
-                this.$axios.post("/project/getProjectList", {})
+                this.$axios.post("/project/getProjectList", {forReport:1})
                 .then(res => {
                     if(res.code == "ok") {
                         for(var i in res.data) {
@@ -1390,7 +1390,7 @@
                     forbidClick: true,
                     duration: 0
                 });
-                this.$axios.post("/project/getProjectList", {})
+                this.$axios.post("/project/getProjectList", {forReport:1})
                 .then(res => {
                     if(res.code == "ok") {
                         this.$toast.clear();