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 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 @@
+ <#--
--> <#--
--> <#--
--> @@ -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");