考核签名修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.oa;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
@@ -91,6 +92,7 @@ public class CmcAssessController extends BaseController
             userId = getLoginUser().getUserId();
         else
             userId = cmcAssess.getUserId();
+        formData.put("userId", userId);
         formData.put("nickName", userService.selectUserById(userId).getNickName());
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
@@ -117,14 +119,14 @@ public class CmcAssessController extends BaseController
             }
             formData.put("otherWork", cmcAssess.getOtherWork());
             formData.put("selfAssess", cmcAssess.getSelfAssess());
-            formData.put("deptAssesser", cmcAssess.getDeptAssesser());
+            formData.put("deptAssesser", cmcAssess.getDeptUser().getNickName());
             formData.put("deptAssessment", cmcAssess.getDeptAssessment());
             formData.put("deptAdvice", cmcAssess.getDeptAdvice());
-            formData.put("deptTime", cmcAssess.getDeptTime());
-            formData.put("managerAssesser", cmcAssess.getManagerAssesser());
+            formData.put("deptTime", cmcAssess.getDeptTime() != null ? DateUtils.dateTime(cmcAssess.getDeptTime()) : cmcAssess.getDeptTime());
+            formData.put("managerAssesser", cmcAssess.getManagerUser().getNickName());
             formData.put("managerAssessment", cmcAssess.getManagerAssessment());
             formData.put("managerAdvice", cmcAssess.getManagerAdvice());
-            formData.put("managerTime", cmcAssess.getManagerTime());
+            formData.put("managerTime", cmcAssess.getManagerTime() != null ? DateUtils.dateTime(cmcAssess.getManagerTime()) : cmcAssess.getManagerTime());
             for (CmcAssessContent cmcAssessContent: cmcAssessContentList) {
                 formData.put("role" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRole());
                 formData.put("familiar" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getFamiliar());
@@ -240,14 +242,18 @@ public class CmcAssessController extends BaseController
         cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
         cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
         cmcAssess.setSelfAssess(formDataJson.getString("selfAssess"));
-        cmcAssess.setDeptAssesser(formDataJson.getString("deptAssesser"));
-        cmcAssess.setDeptAssessment(formDataJson.getString("deptAssessment"));
-        cmcAssess.setDeptAdvice(formDataJson.getString("deptAdvice"));
-        cmcAssess.setDeptTime(formDataJson.getDate("deptTime"));
-        cmcAssess.setManagerAssesser(formDataJson.getString("managerAssesser"));
-        cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
-        cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
-        cmcAssess.setManagerTime(formDataJson.getDate("managerTime"));
+        if (formDataJson.getString("deptAssessment") != null && formDataJson.getString("managerAssessment") == null) {
+            cmcAssess.setDeptAssesser(getLoginUser().getUserId());
+            cmcAssess.setDeptAssessment(formDataJson.getString("deptAssessment"));
+            cmcAssess.setDeptAdvice(formDataJson.getString("deptAdvice"));
+            cmcAssess.setDeptTime(new Date());
+        }
+        if (formDataJson.getString("managerAssessment") != null) {
+            cmcAssess.setManagerAssesser(getLoginUser().getUserId());
+            cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
+            cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
+            cmcAssess.setManagerTime(new Date());
+        }
         //判断是否删除某项考核工作
         List<CmcAssessContentWork> cmcAssessContentWorks = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId"));
         List<String> oldCmcAssessContentWorkIds = new ArrayList<>();

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -47,7 +48,9 @@ public class CmcAssess extends BaseEntity
 
     /** 部门考核负责人 */
     @Excel(name = "部门考核负责人")
-    private String deptAssesser;
+    private Long deptAssesser;
+
+    private SysUser deptUser;
 
     /** 分管考核等级（不合格、合格、良好、优秀） */
     @Excel(name = "分管考核等级", readConverterExp = "不合格、合格、良好、优秀")
@@ -64,7 +67,9 @@ public class CmcAssess extends BaseEntity
 
     /** 分管考核负责人 */
     @Excel(name = "分管考核负责人")
-    private String managerAssesser;
+    private Long managerAssesser;
+
+    private SysUser managerUser;
 
     /** 自述 */
     @Excel(name = "自述")
@@ -142,12 +147,12 @@ public class CmcAssess extends BaseEntity
     {
         return deptTime;
     }
-    public void setDeptAssesser(String deptAssesser)
+    public void setDeptAssesser(Long deptAssesser)
     {
         this.deptAssesser = deptAssesser;
     }
 
-    public String getDeptAssesser()
+    public Long getDeptAssesser()
     {
         return deptAssesser;
     }
@@ -178,12 +183,12 @@ public class CmcAssess extends BaseEntity
     {
         return managerTime;
     }
-    public void setManagerAssesser(String managerAssesser)
+    public void setManagerAssesser(Long managerAssesser)
     {
         this.managerAssesser = managerAssesser;
     }
 
-    public String getManagerAssesser()
+    public Long getManagerAssesser()
     {
         return managerAssesser;
     }
@@ -214,6 +219,24 @@ public class CmcAssess extends BaseEntity
     {
         return otherWork;
     }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessMapper.xml

@@ -20,36 +20,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="selfAssess"    column="self_assess"    />
         <result property="fillTime"    column="fill_time"    />
         <result property="otherWork"    column="other_work"    />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcAssessVo">
-        select assess_id, user_id, project_id, assess_time, dept_assessment, dept_advice, dept_time, dept_assesser, manager_assessment, manager_advice, manager_time, manager_assesser, self_assess, fill_time, other_work from cmc_assess
+        select a.assess_id, a.user_id, a.project_id, a.assess_time, a.dept_assessment, a.dept_advice, a.dept_time, a.dept_assesser, u1.nick_name as dept_nick_name, a.manager_assessment,
+               a.manager_advice, a.manager_time, a.manager_assesser, u2.nick_name as manager_nick_name, a.self_assess, a.fill_time, a.other_work from cmc_assess as a
+        left join sys_user as u1 on u1.user_id = a.dept_assesser
+        left join sys_user as u2 on u2.user_id = a.manager_assesser
     </sql>
 
     <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">
         <include refid="selectCmcAssessVo"/>
         <where>
-            <if test="assessId != null "> and assess_id = #{assessId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="projectId != null "> and project_id = #{projectId}</if>
-            <if test="assessTime != null "> and assess_time = #{assessTime}</if>
-            <if test="deptAssessment != null  and deptAssessment != ''"> and dept_assessment = #{deptAssessment}</if>
-            <if test="deptAdvice != null  and deptAdvice != ''"> and dept_advice = #{deptAdvice}</if>
-            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
-            <if test="deptAssesser != null  and deptAssesser != ''"> and dept_assesser = #{deptAssesser}</if>
-            <if test="managerAssessment != null  and managerAssessment != ''"> and manager_assessment = #{managerAssessment}</if>
-            <if test="managerAdvice != null  and managerAdvice != ''"> and manager_advice = #{managerAdvice}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="managerAssesser != null  and managerAssesser != ''"> and manager_assesser = #{managerAssesser}</if>
-            <if test="selfAssess != null  and selfAssess != ''"> and self_assess = #{selfAssess}</if>
-            <if test="fillTime != null "> and fill_time = #{fillTime}</if>
-            <if test="otherWork != null  and otherWork != ''"> and other_work = #{otherWork}</if>
+            <if test="assessId != null "> and a.assess_id = #{assessId}</if>
+            <if test="userId != null "> and a.user_id = #{userId}</if>
+            <if test="projectId != null "> and a.project_id = #{projectId}</if>
+            <if test="assessTime != null "> and a.assess_time = #{assessTime}</if>
+            <if test="deptAssessment != null  and deptAssessment != ''"> and a.dept_assessment = #{deptAssessment}</if>
+            <if test="deptAdvice != null  and deptAdvice != ''"> and a.dept_advice = #{deptAdvice}</if>
+            <if test="deptTime != null "> and a.dept_time = #{deptTime}</if>
+            <if test="deptAssesser != null  and deptAssesser != ''"> and a.dept_assesser = #{deptAssesser}</if>
+            <if test="managerAssessment != null  and managerAssessment != ''"> and a.manager_assessment = #{managerAssessment}</if>
+            <if test="managerAdvice != null  and managerAdvice != ''"> and a.manager_advice = #{managerAdvice}</if>
+            <if test="managerTime != null "> and a.manager_time = #{managerTime}</if>
+            <if test="managerAssesser != null  and managerAssesser != ''"> and a.manager_assesser = #{managerAssesser}</if>
+            <if test="selfAssess != null  and selfAssess != ''"> and a.self_assess = #{selfAssess}</if>
+            <if test="fillTime != null "> and a.fill_time = #{fillTime}</if>
+            <if test="otherWork != null  and otherWork != ''"> and a.other_work = #{otherWork}</if>
         </where>
     </select>
 
     <select id="selectCmcAssessByAssessId" parameterType="String" resultMap="CmcAssessResult">
         <include refid="selectCmcAssessVo"/>
-        where assess_id = #{assessId}
+        where a.assess_id = #{assessId}
     </select>
 
     <insert id="insertCmcAssess" parameterType="CmcAssess">

oa-back/sql/sql.sql

@@ -1310,11 +1310,11 @@ create table cmc_assess (
   dept_assessment		char(1)			default null	comment '部门考核等级（不合格、合格、良好、优秀）',
   dept_advice			varchar(255)	default null	comment '部门考核意见',
   dept_time				datetime		default null	comment '部门考核时间',
-  dept_assesser			varchar(30)		default null	comment '部门考核负责人',
+  dept_assesser			bigint			default null	comment '部门考核负责人',
   manager_assessment	char(1)			default null	comment '分管考核等级（不合格、合格、良好、优秀）',
   manager_advice		varchar(255)	default null	comment '分管考核意见',
   manager_time			datetime		default null	comment '分管考核时间',
-  manager_assesser		varchar(10)		default null	comment '分管考核负责人',
+  manager_assesser		bigint			default null	comment '分管考核负责人',
   self_assess			varchar(255)	default null	comment '自述',
   fill_time				datetime		default null	comment '考核填报时间',
   other_work			varchar(255)	default null	comment '其他工作',

oa-ui/src/views/flowable/form/cwTable.vue

@@ -40,7 +40,7 @@
           </el-input>
           <el-row justify="center" type="flex">
                         <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -573,6 +573,9 @@ export default {
       isStaff: false,
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
     if (this.taskName == '部门审核') {
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -642,7 +645,7 @@ export default {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -651,7 +654,7 @@ export default {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/jsTable.vue

@@ -41,7 +41,7 @@
           </el-input>
           <el-row justify="center" type="flex">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -54,7 +54,7 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -654,6 +654,9 @@ export default {
       isStaff: false,
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
     if (this.taskName == '部门审核') {
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -723,7 +726,7 @@ export default {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -732,7 +735,7 @@ export default {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/jyTable.vue

@@ -40,7 +40,7 @@
           </el-input>
           <el-row justify="center" type="flex">
                         <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -357,6 +357,9 @@ export default {
       isStaff: false,
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
     if (this.taskName == '部门审核') {
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -427,7 +430,7 @@ export default {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -436,7 +439,7 @@ export default {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/scTable.vue

@@ -58,7 +58,7 @@
           </el-input>
           <el-row justify="center" type="flex">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -71,7 +71,7 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -1643,6 +1643,9 @@ export default {
       projectList: [],
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
     if (this.taskName == '部门审核') {
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -1774,7 +1777,7 @@ export default {
               });
             })
           } else if (this.taskName == '项目负责人审核') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -1783,7 +1786,7 @@ export default {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/xmTable.vue

@@ -40,7 +40,7 @@
           </el-input>
           <el-row justify="center" type="flex">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -459,7 +459,7 @@ export default {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -468,7 +468,7 @@ export default {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/zhTable.vue

@@ -39,8 +39,8 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,8 @@
           </el-input>
           <el-row justify="center">
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser
+              }} </span>
             </el-col>
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -104,7 +105,7 @@
         </td>
 
         <td rowspan="9">
-          <div>{{ tableForm.remark01 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="9">
@@ -219,7 +220,7 @@
           </el-radio-group>
         </td>
         <td rowspan="8">
-          <div>{{ tableForm.remark02 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="8">
@@ -322,7 +323,7 @@
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark03 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
@@ -400,7 +401,7 @@
           </el-radio-group>
         </td>
         <td rowspan="7">
-          <div>{{ tableForm.remark04 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
@@ -494,7 +495,7 @@
           </el-radio-group>
         </td>
         <td rowspan="10">
-          <div>{{ tableForm.remark05 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
@@ -611,7 +612,7 @@
           </el-radio-group>
         </td>
         <td rowspan="7">
-          <div>{{ tableForm.remark06 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark06 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
@@ -704,7 +705,7 @@
           </el-radio-group>
         </td>
         <td rowspan="2">
-          <div>{{ tableForm.remark07 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark07 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark07" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="2">
@@ -758,7 +759,7 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;">
-      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过' }}</el-button>
       <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
@@ -775,10 +776,6 @@ import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
   props: {
-    tableForm: {
-      type: Object,
-      required: true
-    },
     taskName: {
       type: String
     },
@@ -809,6 +806,9 @@ export default {
       isStaff: false,
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
     if (this.taskName == '部门审核') {
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -824,7 +824,7 @@ export default {
     this.formatForm();
   },
   methods: {
-initForm() {
+    initForm() {
       getAssess(this.taskForm.formId).then(res => {
         let data = res.data;
         for (let d in data) {
@@ -838,6 +838,7 @@ initForm() {
           }
         }
         this.tableForm = data;
+        console.log(this.tableForm);
       })
     },
     formatForm() {
@@ -878,7 +879,7 @@ initForm() {
         const params = { taskId: this.taskForm.taskId }
         getNextFlowNode(params).then(res => {
           if (this.taskName == '员工填报') {
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
               if (res.data)
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -887,7 +888,7 @@ initForm() {
               });
             })
           } else if (this.taskName == '部门审核') {
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
               let userId = res.data.userId;
               this.$set(this.taskForm.variables, "approval", userId);
               complete(this.taskForm).then(response => {
@@ -1034,6 +1035,7 @@ td {
   border-radius: 0px;
   background: none;
 }
+
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;