From bedfe05015a225901339a361874927b61e263896 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 19 Feb 2025 15:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E8=B4=A3=E5=AE=A1=E6=89=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/evaluate/summaryAudit/responsibleForApproval.js | 5 +++-- .../responsibleApproval/responsibleForApproval.html | 1 + .../pages/evaluate/responsibleApproval/reviewPage.html | 1 + .../pages/evaluate/summaryAudit/proEvaluateAuditForm.html | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js b/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js index 44729ee..93ae365 100644 --- a/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js +++ b/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js @@ -1,3 +1,4 @@ +// 专责审批 js文件 let layer, laydate, table, form; $(function () { layui.use(["layer", "laydate", "table", "form"], function () { @@ -27,7 +28,7 @@ function search(type) { form.render("select"); } table.reload("baseTable", { - url: ctxPath + "/backstage/evaluate/evalSummaryList", + url: ctxPath + "/backstage/evaluate/dedicatedEvalSummaryList", page: { curr: 1, }, @@ -47,7 +48,7 @@ function initTable() { //渲染表格 table.render({ elem: "#baseTable", - url: ctxPath + "/backstage/evaluate/evalSummaryList", //数据接口 + url: ctxPath + "/backstage/evaluate/dedicatedEvalSummaryList", //数据接口 method: "get", //方式默认是get toolbar: "default", //开启工具栏，此处显示默认图标，可以自定义模板，详见文档 where: { diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html b/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html index 18fe5a0..c7e2752 100644 --- a/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html +++ b/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html @@ -2,6 +2,7 @@ + 汇总审核 diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html b/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html index 49b7ca8..b0beed0 100644 --- a/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html +++ b/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html @@ -8,6 +8,7 @@ +
diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html index dc99d8c..35a7ca2 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html @@ -127,17 +127,17 @@ console.log("ddddd:", d) //如果d.isApprove == 1 去除当前行的编辑功能 let text = ""; - if (d.isTwoApprove == 1 && d.isApprove == 1) { + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 0) { text += '通过'; text += '驳回'; } else { - if (d.isTwoApprove == 1 && d.isApprove == 1) { + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 1) { text += '已通过'; - } else if (d.isTwoApprove == 2 && d.isApprove == 1) { + } else if (d.isThreeApprove == 2 && d.isTwoApprove == 1) { text += '已驳回'; } else {