diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html index 35a7ca2..070869c 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html @@ -159,20 +159,40 @@ if (cellData.field === 'examineAndApprove') { cellData.templet = function (d) { //如果d.isApprove == 1 去除当前行的编辑功能 - let text = ""; - if (d.isTwoApprove == 1) { - text += '已通过'; - } - if (d.isTwoApprove == 2) { - text += '已驳回'; - } + // let text = ""; + // if (d.isTwoApprove == 1) { + // text += '已通过'; + // } + // if (d.isTwoApprove == 2) { + // text += '已驳回'; + // } // text += '通过'; // text += // '驳回'; + + let text = ""; + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 0) { + text += '通过'; + text += + '驳回'; + } else { + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 1) { + text += '已通过'; + } else if (d.isThreeApprove == 2 && d.isTwoApprove == 1) { + text += '已驳回'; + } else { + noMessage++ + return '' + } + } return text; } }