From 412b502027920818460b1bc5b1383d637889c574 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 16:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../summaryAudit/proEvaluateAuditForm.html | 38 ++++++++++++++-----
1 file changed, 29 insertions(+), 9 deletions(-)
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;
}
}