bug修改
This commit is contained in:
parent
1b60f6609a
commit
804b52e1c7
|
|
@ -180,7 +180,7 @@
|
||||||
FROM
|
FROM
|
||||||
pj_evaluate_details
|
pj_evaluate_details
|
||||||
WHERE
|
WHERE
|
||||||
post_id = #{deptId}
|
post_id = #{userDeptId}
|
||||||
<if test="deptId == 0 or deptId == '0'">
|
<if test="deptId == 0 or deptId == '0'">
|
||||||
and person_id = #{userId}
|
and person_id = #{userId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@
|
||||||
}
|
}
|
||||||
, {
|
, {
|
||||||
field: 'auditStatus', align: 'center', title: '审核状态', templet:function(d){
|
field: 'auditStatus', align: 'center', title: '审核状态', templet:function(d){
|
||||||
if(d.auditState==='4' || d.auditState===4){
|
if(d.rejectReason){
|
||||||
return '已驳回'
|
return '已驳回'
|
||||||
}else{
|
}else{
|
||||||
return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价'))
|
return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价'))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue