Bladeren bron

考核签名修改

lamphua 1 jaar geleden
bovenliggende
commit
f14cf0cc72

+ 18
- 12
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java Bestand weergeven

@@ -1,6 +1,7 @@
1 1
 package com.ruoyi.web.controller.oa;
2 2
 
3 3
 import java.util.ArrayList;
4
+import java.util.Date;
4 5
 import java.util.List;
5 6
 import java.util.Objects;
6 7
 import javax.servlet.http.HttpServletResponse;
@@ -91,6 +92,7 @@ public class CmcAssessController extends BaseController
91 92
             userId = getLoginUser().getUserId();
92 93
         else
93 94
             userId = cmcAssess.getUserId();
95
+        formData.put("userId", userId);
94 96
         formData.put("nickName", userService.selectUserById(userId).getNickName());
95 97
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
96 98
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
@@ -117,14 +119,14 @@ public class CmcAssessController extends BaseController
117 119
             }
118 120
             formData.put("otherWork", cmcAssess.getOtherWork());
119 121
             formData.put("selfAssess", cmcAssess.getSelfAssess());
120
-            formData.put("deptAssesser", cmcAssess.getDeptAssesser());
122
+            formData.put("deptAssesser", cmcAssess.getDeptUser().getNickName());
121 123
             formData.put("deptAssessment", cmcAssess.getDeptAssessment());
122 124
             formData.put("deptAdvice", cmcAssess.getDeptAdvice());
123
-            formData.put("deptTime", cmcAssess.getDeptTime());
124
-            formData.put("managerAssesser", cmcAssess.getManagerAssesser());
125
+            formData.put("deptTime", cmcAssess.getDeptTime() != null ? DateUtils.dateTime(cmcAssess.getDeptTime()) : cmcAssess.getDeptTime());
126
+            formData.put("managerAssesser", cmcAssess.getManagerUser().getNickName());
125 127
             formData.put("managerAssessment", cmcAssess.getManagerAssessment());
126 128
             formData.put("managerAdvice", cmcAssess.getManagerAdvice());
127
-            formData.put("managerTime", cmcAssess.getManagerTime());
129
+            formData.put("managerTime", cmcAssess.getManagerTime() != null ? DateUtils.dateTime(cmcAssess.getManagerTime()) : cmcAssess.getManagerTime());
128 130
             for (CmcAssessContent cmcAssessContent: cmcAssessContentList) {
129 131
                 formData.put("role" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRole());
130 132
                 formData.put("familiar" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getFamiliar());
@@ -240,14 +242,18 @@ public class CmcAssessController extends BaseController
240 242
         cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
241 243
         cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
242 244
         cmcAssess.setSelfAssess(formDataJson.getString("selfAssess"));
243
-        cmcAssess.setDeptAssesser(formDataJson.getString("deptAssesser"));
244
-        cmcAssess.setDeptAssessment(formDataJson.getString("deptAssessment"));
245
-        cmcAssess.setDeptAdvice(formDataJson.getString("deptAdvice"));
246
-        cmcAssess.setDeptTime(formDataJson.getDate("deptTime"));
247
-        cmcAssess.setManagerAssesser(formDataJson.getString("managerAssesser"));
248
-        cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
249
-        cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
250
-        cmcAssess.setManagerTime(formDataJson.getDate("managerTime"));
245
+        if (formDataJson.getString("deptAssessment") != null && formDataJson.getString("managerAssessment") == null) {
246
+            cmcAssess.setDeptAssesser(getLoginUser().getUserId());
247
+            cmcAssess.setDeptAssessment(formDataJson.getString("deptAssessment"));
248
+            cmcAssess.setDeptAdvice(formDataJson.getString("deptAdvice"));
249
+            cmcAssess.setDeptTime(new Date());
250
+        }
251
+        if (formDataJson.getString("managerAssessment") != null) {
252
+            cmcAssess.setManagerAssesser(getLoginUser().getUserId());
253
+            cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
254
+            cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
255
+            cmcAssess.setManagerTime(new Date());
256
+        }
251 257
         //判断是否删除某项考核工作
252 258
         List<CmcAssessContentWork> cmcAssessContentWorks = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId"));
253 259
         List<String> oldCmcAssessContentWorkIds = new ArrayList<>();

+ 29
- 6
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java Bestand weergeven

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
2 2
 
3 3
 import java.util.Date;
4 4
 import com.fasterxml.jackson.annotation.JsonFormat;
5
+import com.ruoyi.common.core.domain.entity.SysUser;
5 6
 import org.apache.commons.lang3.builder.ToStringBuilder;
6 7
 import org.apache.commons.lang3.builder.ToStringStyle;
7 8
 import com.ruoyi.common.annotation.Excel;
@@ -47,7 +48,9 @@ public class CmcAssess extends BaseEntity
47 48
 
48 49
     /** 部门考核负责人 */
49 50
     @Excel(name = "部门考核负责人")
50
-    private String deptAssesser;
51
+    private Long deptAssesser;
52
+
53
+    private SysUser deptUser;
51 54
 
52 55
     /** 分管考核等级(不合格、合格、良好、优秀) */
53 56
     @Excel(name = "分管考核等级", readConverterExp = "不合格、合格、良好、优秀")
@@ -64,7 +67,9 @@ public class CmcAssess extends BaseEntity
64 67
 
65 68
     /** 分管考核负责人 */
66 69
     @Excel(name = "分管考核负责人")
67
-    private String managerAssesser;
70
+    private Long managerAssesser;
71
+
72
+    private SysUser managerUser;
68 73
 
69 74
     /** 自述 */
70 75
     @Excel(name = "自述")
@@ -142,12 +147,12 @@ public class CmcAssess extends BaseEntity
142 147
     {
143 148
         return deptTime;
144 149
     }
145
-    public void setDeptAssesser(String deptAssesser)
150
+    public void setDeptAssesser(Long deptAssesser)
146 151
     {
147 152
         this.deptAssesser = deptAssesser;
148 153
     }
149 154
 
150
-    public String getDeptAssesser()
155
+    public Long getDeptAssesser()
151 156
     {
152 157
         return deptAssesser;
153 158
     }
@@ -178,12 +183,12 @@ public class CmcAssess extends BaseEntity
178 183
     {
179 184
         return managerTime;
180 185
     }
181
-    public void setManagerAssesser(String managerAssesser)
186
+    public void setManagerAssesser(Long managerAssesser)
182 187
     {
183 188
         this.managerAssesser = managerAssesser;
184 189
     }
185 190
 
186
-    public String getManagerAssesser()
191
+    public Long getManagerAssesser()
187 192
     {
188 193
         return managerAssesser;
189 194
     }
@@ -214,6 +219,24 @@ public class CmcAssess extends BaseEntity
214 219
     {
215 220
         return otherWork;
216 221
     }
222
+    public void setDeptUser(SysUser deptUser)
223
+    {
224
+        this.deptUser = deptUser;
225
+    }
226
+
227
+    public SysUser getDeptUser()
228
+    {
229
+        return deptUser;
230
+    }
231
+    public void setManagerUser(SysUser managerUser)
232
+    {
233
+        this.managerUser = managerUser;
234
+    }
235
+
236
+    public SysUser getManagerUser()
237
+    {
238
+        return managerUser;
239
+    }
217 240
 
218 241
     @Override
219 242
     public String toString() {

+ 32
- 17
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessMapper.xml Bestand weergeven

@@ -20,36 +20,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
20 20
         <result property="selfAssess"    column="self_assess"    />
21 21
         <result property="fillTime"    column="fill_time"    />
22 22
         <result property="otherWork"    column="other_work"    />
23
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
24
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
25
+    </resultMap>
26
+
27
+    <resultMap type="SysUser" id="DeptUserResult">
28
+        <result property="userId"    column="user_id"    />
29
+        <result property="nickName"    column="dept_nick_name"    />
30
+    </resultMap>
31
+
32
+    <resultMap type="SysUser" id="ManagerUserResult">
33
+        <result property="userId"    column="user_id"    />
34
+        <result property="nickName"    column="manager_nick_name"    />
23 35
     </resultMap>
24 36
 
25 37
     <sql id="selectCmcAssessVo">
26
-        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
38
+        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,
39
+               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
40
+        left join sys_user as u1 on u1.user_id = a.dept_assesser
41
+        left join sys_user as u2 on u2.user_id = a.manager_assesser
27 42
     </sql>
28 43
 
29 44
     <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">
30 45
         <include refid="selectCmcAssessVo"/>
31 46
         <where>
32
-            <if test="assessId != null "> and assess_id = #{assessId}</if>
33
-            <if test="userId != null "> and user_id = #{userId}</if>
34
-            <if test="projectId != null "> and project_id = #{projectId}</if>
35
-            <if test="assessTime != null "> and assess_time = #{assessTime}</if>
36
-            <if test="deptAssessment != null  and deptAssessment != ''"> and dept_assessment = #{deptAssessment}</if>
37
-            <if test="deptAdvice != null  and deptAdvice != ''"> and dept_advice = #{deptAdvice}</if>
38
-            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
39
-            <if test="deptAssesser != null  and deptAssesser != ''"> and dept_assesser = #{deptAssesser}</if>
40
-            <if test="managerAssessment != null  and managerAssessment != ''"> and manager_assessment = #{managerAssessment}</if>
41
-            <if test="managerAdvice != null  and managerAdvice != ''"> and manager_advice = #{managerAdvice}</if>
42
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
43
-            <if test="managerAssesser != null  and managerAssesser != ''"> and manager_assesser = #{managerAssesser}</if>
44
-            <if test="selfAssess != null  and selfAssess != ''"> and self_assess = #{selfAssess}</if>
45
-            <if test="fillTime != null "> and fill_time = #{fillTime}</if>
46
-            <if test="otherWork != null  and otherWork != ''"> and other_work = #{otherWork}</if>
47
+            <if test="assessId != null "> and a.assess_id = #{assessId}</if>
48
+            <if test="userId != null "> and a.user_id = #{userId}</if>
49
+            <if test="projectId != null "> and a.project_id = #{projectId}</if>
50
+            <if test="assessTime != null "> and a.assess_time = #{assessTime}</if>
51
+            <if test="deptAssessment != null  and deptAssessment != ''"> and a.dept_assessment = #{deptAssessment}</if>
52
+            <if test="deptAdvice != null  and deptAdvice != ''"> and a.dept_advice = #{deptAdvice}</if>
53
+            <if test="deptTime != null "> and a.dept_time = #{deptTime}</if>
54
+            <if test="deptAssesser != null  and deptAssesser != ''"> and a.dept_assesser = #{deptAssesser}</if>
55
+            <if test="managerAssessment != null  and managerAssessment != ''"> and a.manager_assessment = #{managerAssessment}</if>
56
+            <if test="managerAdvice != null  and managerAdvice != ''"> and a.manager_advice = #{managerAdvice}</if>
57
+            <if test="managerTime != null "> and a.manager_time = #{managerTime}</if>
58
+            <if test="managerAssesser != null  and managerAssesser != ''"> and a.manager_assesser = #{managerAssesser}</if>
59
+            <if test="selfAssess != null  and selfAssess != ''"> and a.self_assess = #{selfAssess}</if>
60
+            <if test="fillTime != null "> and a.fill_time = #{fillTime}</if>
61
+            <if test="otherWork != null  and otherWork != ''"> and a.other_work = #{otherWork}</if>
47 62
         </where>
48 63
     </select>
49 64
 
50 65
     <select id="selectCmcAssessByAssessId" parameterType="String" resultMap="CmcAssessResult">
51 66
         <include refid="selectCmcAssessVo"/>
52
-        where assess_id = #{assessId}
67
+        where a.assess_id = #{assessId}
53 68
     </select>
54 69
 
55 70
     <insert id="insertCmcAssess" parameterType="CmcAssess">

+ 2
- 2
oa-back/sql/sql.sql Bestand weergeven

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

+ 7
- 4
oa-ui/src/views/flowable/form/cwTable.vue Bestand weergeven

@@ -40,7 +40,7 @@
40 40
           </el-input>
41 41
           <el-row justify="center" type="flex">
42 42
                         <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
44 44
             </el-col>
45 45
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46 46
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
53 53
           </el-input>
54 54
           <el-row justify="center">
55 55
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
57 57
             </el-col>
58 58
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59 59
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -573,6 +573,9 @@ export default {
573 573
       isStaff: false,
574 574
     }
575 575
   },
576
+  computed: {
577
+    ...mapGetters(["userId", "name"]),
578
+  },
576 579
   created() {
577 580
     if (this.taskName == '部门审核') {
578 581
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -642,7 +645,7 @@ export default {
642 645
         const params = { taskId: this.taskForm.taskId }
643 646
         getNextFlowNode(params).then(res => {
644 647
           if (this.taskName == '员工填报') {
645
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
648
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
646 649
               if (res.data)
647 650
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
648 651
               complete(this.taskForm).then(response => {
@@ -651,7 +654,7 @@ export default {
651 654
               });
652 655
             })
653 656
           } else if (this.taskName == '部门审核') {
654
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
657
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
655 658
               let userId = res.data.userId;
656 659
               this.$set(this.taskForm.variables, "approval", userId);
657 660
               complete(this.taskForm).then(response => {

+ 7
- 4
oa-ui/src/views/flowable/form/jsTable.vue Bestand weergeven

@@ -41,7 +41,7 @@
41 41
           </el-input>
42 42
           <el-row justify="center" type="flex">
43 43
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
44
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
44
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
45 45
             </el-col>
46 46
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
47 47
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -54,7 +54,7 @@
54 54
           </el-input>
55 55
           <el-row justify="center">
56 56
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
57
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
57
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
58 58
             </el-col>
59 59
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
60 60
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -654,6 +654,9 @@ export default {
654 654
       isStaff: false,
655 655
     }
656 656
   },
657
+  computed: {
658
+    ...mapGetters(["userId", "name"]),
659
+  },
657 660
   created() {
658 661
     if (this.taskName == '部门审核') {
659 662
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -723,7 +726,7 @@ export default {
723 726
         const params = { taskId: this.taskForm.taskId }
724 727
         getNextFlowNode(params).then(res => {
725 728
           if (this.taskName == '员工填报') {
726
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
729
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
727 730
               if (res.data)
728 731
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
729 732
               complete(this.taskForm).then(response => {
@@ -732,7 +735,7 @@ export default {
732 735
               });
733 736
             })
734 737
           } else if (this.taskName == '部门审核') {
735
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
738
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
736 739
               let userId = res.data.userId;
737 740
               this.$set(this.taskForm.variables, "approval", userId);
738 741
               complete(this.taskForm).then(response => {

+ 7
- 4
oa-ui/src/views/flowable/form/jyTable.vue Bestand weergeven

@@ -40,7 +40,7 @@
40 40
           </el-input>
41 41
           <el-row justify="center" type="flex">
42 42
                         <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
44 44
             </el-col>
45 45
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46 46
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
53 53
           </el-input>
54 54
           <el-row justify="center">
55 55
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
57 57
             </el-col>
58 58
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59 59
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -357,6 +357,9 @@ export default {
357 357
       isStaff: false,
358 358
     }
359 359
   },
360
+  computed: {
361
+    ...mapGetters(["userId", "name"]),
362
+  },
360 363
   created() {
361 364
     if (this.taskName == '部门审核') {
362 365
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -427,7 +430,7 @@ export default {
427 430
         const params = { taskId: this.taskForm.taskId }
428 431
         getNextFlowNode(params).then(res => {
429 432
           if (this.taskName == '员工填报') {
430
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
433
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
431 434
               if (res.data)
432 435
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
433 436
               complete(this.taskForm).then(response => {
@@ -436,7 +439,7 @@ export default {
436 439
               });
437 440
             })
438 441
           } else if (this.taskName == '部门审核') {
439
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
442
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
440 443
               let userId = res.data.userId;
441 444
               this.$set(this.taskForm.variables, "approval", userId);
442 445
               complete(this.taskForm).then(response => {

+ 7
- 4
oa-ui/src/views/flowable/form/scTable.vue Bestand weergeven

@@ -58,7 +58,7 @@
58 58
           </el-input>
59 59
           <el-row justify="center" type="flex">
60 60
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
61
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
61
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
62 62
             </el-col>
63 63
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
64 64
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -71,7 +71,7 @@
71 71
           </el-input>
72 72
           <el-row justify="center">
73 73
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
74
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
74
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
75 75
             </el-col>
76 76
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
77 77
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -1643,6 +1643,9 @@ export default {
1643 1643
       projectList: [],
1644 1644
     }
1645 1645
   },
1646
+  computed: {
1647
+    ...mapGetters(["userId", "name"]),
1648
+  },
1646 1649
   created() {
1647 1650
     if (this.taskName == '部门审核') {
1648 1651
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -1774,7 +1777,7 @@ export default {
1774 1777
               });
1775 1778
             })
1776 1779
           } else if (this.taskName == '项目负责人审核') {
1777
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
1780
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
1778 1781
               if (res.data)
1779 1782
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
1780 1783
               complete(this.taskForm).then(response => {
@@ -1783,7 +1786,7 @@ export default {
1783 1786
               });
1784 1787
             })
1785 1788
           } else if (this.taskName == '部门审核') {
1786
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
1789
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
1787 1790
               let userId = res.data.userId;
1788 1791
               this.$set(this.taskForm.variables, "approval", userId);
1789 1792
               complete(this.taskForm).then(response => {

+ 4
- 4
oa-ui/src/views/flowable/form/xmTable.vue Bestand weergeven

@@ -40,7 +40,7 @@
40 40
           </el-input>
41 41
           <el-row justify="center" type="flex">
42 42
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
44 44
             </el-col>
45 45
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46 46
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,7 @@
53 53
           </el-input>
54 54
           <el-row justify="center">
55 55
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser }} </span>
57 57
             </el-col>
58 58
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59 59
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -459,7 +459,7 @@ export default {
459 459
         const params = { taskId: this.taskForm.taskId }
460 460
         getNextFlowNode(params).then(res => {
461 461
           if (this.taskName == '员工填报') {
462
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
462
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
463 463
               if (res.data)
464 464
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
465 465
               complete(this.taskForm).then(response => {
@@ -468,7 +468,7 @@ export default {
468 468
               });
469 469
             })
470 470
           } else if (this.taskName == '部门审核') {
471
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
471
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
472 472
               let userId = res.data.userId;
473 473
               this.$set(this.taskForm.variables, "approval", userId);
474 474
               complete(this.taskForm).then(response => {

+ 20
- 18
oa-ui/src/views/flowable/form/zhTable.vue Bestand weergeven

@@ -39,8 +39,8 @@
39 39
             :disabled="!isDeptLeader">
40 40
           </el-input>
41 41
           <el-row justify="center" type="flex">
42
-                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
-              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
42
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
43
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser : deptAssesser }} </span>
44 44
             </el-col>
45 45
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
46 46
               <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
@@ -53,7 +53,8 @@
53 53
           </el-input>
54 54
           <el-row justify="center">
55 55
             <el-col :span="12" style="text-align:center; padding-top:7px;">考核人:
56
-              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
56
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser : managerAssesser
57
+              }} </span>
57 58
             </el-col>
58 59
             <el-col :span="12" style="text-align:center; padding-top:7px;">日期:
59 60
               <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
@@ -104,7 +105,7 @@
104 105
         </td>
105 106
 
106 107
         <td rowspan="9">
107
-          <div>{{ tableForm.remark01 }}</div>
108
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
108 109
           <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
109 110
         </td>
110 111
         <td rowspan="9">
@@ -219,7 +220,7 @@
219 220
           </el-radio-group>
220 221
         </td>
221 222
         <td rowspan="8">
222
-          <div>{{ tableForm.remark02 }}</div>
223
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
223 224
           <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
224 225
         </td>
225 226
         <td rowspan="8">
@@ -322,7 +323,7 @@
322 323
           </el-radio-group>
323 324
         </td>
324 325
         <td rowspan="5">
325
-          <div>{{ tableForm.remark03 }}</div>
326
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
326 327
           <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
327 328
         </td>
328 329
         <td rowspan="5">
@@ -400,7 +401,7 @@
400 401
           </el-radio-group>
401 402
         </td>
402 403
         <td rowspan="7">
403
-          <div>{{ tableForm.remark04 }}</div>
404
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
404 405
           <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
405 406
         </td>
406 407
         <td rowspan="7">
@@ -494,7 +495,7 @@
494 495
           </el-radio-group>
495 496
         </td>
496 497
         <td rowspan="10">
497
-          <div>{{ tableForm.remark05 }}</div>
498
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
498 499
           <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
499 500
         </td>
500 501
         <td rowspan="10">
@@ -611,7 +612,7 @@
611 612
           </el-radio-group>
612 613
         </td>
613 614
         <td rowspan="7">
614
-          <div>{{ tableForm.remark06 }}</div>
615
+          <div v-if="!isStaff">{{ tableForm.remark06 }}</div>
615 616
           <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
616 617
         </td>
617 618
         <td rowspan="7">
@@ -704,7 +705,7 @@
704 705
           </el-radio-group>
705 706
         </td>
706 707
         <td rowspan="2">
707
-          <div>{{ tableForm.remark07 }}</div>
708
+          <div v-if="!isStaff">{{ tableForm.remark07 }}</div>
708 709
           <el-input v-if="isStaff" v-model="tableForm.remark07" type="textarea" :rows="4"></el-input>
709 710
         </td>
710 711
         <td rowspan="2">
@@ -758,7 +759,7 @@
758 759
       </tr>
759 760
     </table>
760 761
     <el-row justify="center" type="flex" style="margin-top:20px;">
761
-      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
762
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过' }}</el-button>
762 763
       <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
763 764
     </el-row>
764 765
   </div>
@@ -775,10 +776,6 @@ import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
775 776
 export default {
776 777
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
777 778
   props: {
778
-    tableForm: {
779
-      type: Object,
780
-      required: true
781
-    },
782 779
     taskName: {
783 780
       type: String
784 781
     },
@@ -809,6 +806,9 @@ export default {
809 806
       isStaff: false,
810 807
     }
811 808
   },
809
+  computed: {
810
+    ...mapGetters(["userId", "name"]),
811
+  },
812 812
   created() {
813 813
     if (this.taskName == '部门审核') {
814 814
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -824,7 +824,7 @@ export default {
824 824
     this.formatForm();
825 825
   },
826 826
   methods: {
827
-initForm() {
827
+    initForm() {
828 828
       getAssess(this.taskForm.formId).then(res => {
829 829
         let data = res.data;
830 830
         for (let d in data) {
@@ -838,6 +838,7 @@ initForm() {
838 838
           }
839 839
         }
840 840
         this.tableForm = data;
841
+        console.log(this.tableForm);
841 842
       })
842 843
     },
843 844
     formatForm() {
@@ -878,7 +879,7 @@ initForm() {
878 879
         const params = { taskId: this.taskForm.taskId }
879 880
         getNextFlowNode(params).then(res => {
880 881
           if (this.taskName == '员工填报') {
881
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
882
+            getUsersDeptLeader({ userId: this.tableForm.userId }).then(res => {
882 883
               if (res.data)
883 884
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
884 885
               complete(this.taskForm).then(response => {
@@ -887,7 +888,7 @@ initForm() {
887 888
               });
888 889
             })
889 890
           } else if (this.taskName == '部门审核') {
890
-            getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
891
+            getUsersManageLeader({ userId: this.tableForm.userId }).then(res => {
891 892
               let userId = res.data.userId;
892 893
               this.$set(this.taskForm.variables, "approval", userId);
893 894
               complete(this.taskForm).then(response => {
@@ -1034,6 +1035,7 @@ td {
1034 1035
   border-radius: 0px;
1035 1036
   background: none;
1036 1037
 }
1038
+
1037 1039
 .auditor {
1038 1040
   font-family: '华文行楷';
1039 1041
   font-size: 20px;

Laden…
Annuleren
Opslaan