From 15c127ef9b9fa801ec971f244bbaae2094e21d0a Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Thu, 2 Dec 2021 18:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/ProjectController.java | 2 ++ src/main/resources/templates/admin/project_approve.ftl | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 1493ef1..c1c5d52 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -390,7 +390,9 @@ public class ProjectController extends BaseController { Date current = project.getStartDate(); time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2); model.put("time", time); + model.put("check", 1); } else { + model.put("check", 0); time = searchInfo.get("time"); } model.put("formerBean", projectSettleService.getFormerSettle(project, time)); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 64c9619..aff5e03 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -99,7 +99,7 @@
-
+
class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in" id="tab1"> @@ -630,7 +630,7 @@
-
+
class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in" id="tab4"> <#if (project.status==10 || project.status==15) && project.approveStatusSettle == 1>
@@ -1958,7 +1958,6 @@ $("#pmsForm").submit(); } }); - document.getElementById("jiesuan").setAttribute("active",true) }); function setKeywords(time) {