From dd541bf2a08deac8452bb8fbb60255e2b5257a38 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 19 Aug 2022 20:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=88=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/controller/backend/MonthlySettleController.java       | 2 ++
 src/main/resources/templates/admin/monthly_settle_info.ftl     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java b/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java
index 69ca538..da175f1 100644
--- a/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java
@@ -62,6 +62,7 @@ public class MonthlySettleController extends BaseController {
     public String info(@RequestParam("id") int id, Map<String, Object> model) {
         MonthlySettle monthlySettle = monthlySettleService.findById(id);
         model.put("monthlySettle", monthlySettle);
+        model.put("projectNameStr", monthlySettle.getProjectName());
         model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
         return "/admin/monthly_settle_info";
     }
@@ -73,6 +74,7 @@ public class MonthlySettleController extends BaseController {
             monthlySettle = new MonthlySettle();
         }
         model.put("monthlySettle", monthlySettle);
+        model.put("projectNameStr", projectName);
         model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
         return "/admin/monthly_settle_info";
     }
diff --git a/src/main/resources/templates/admin/monthly_settle_info.ftl b/src/main/resources/templates/admin/monthly_settle_info.ftl
index 893da9a..14870ae 100644
--- a/src/main/resources/templates/admin/monthly_settle_info.ftl
+++ b/src/main/resources/templates/admin/monthly_settle_info.ftl
@@ -112,6 +112,7 @@
                 <div class="am-tabs-bd">
                     <div class="am-tab-panel am-fade am-in am-active" id="tab1">
                         <input name="id" id="id" type="hidden" value="${monthlySettle.id!}" />
+                        <input name="projectNameStr" id="projectNameStr" type="hidden" value="${projectNameStr!}" />
 <#--                        <div class="am-u-sm-10">-->
 <#--                            <div class="am-form am-form-inline">-->
 <#--                                <div class="am-form-group am-form-icon">-->
@@ -377,7 +378,7 @@
                 console.log($(this.elem).val());
             },
             done: function() {
-                var projectName = $("#projectName").val();
+                var projectName = $("#projectNameStr").val();
                 var time = $(this.elem).val();
                 console.log("time:" + time)
                 $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?projectName=" + projectName + "&month=" + time + "&listFrom=list");