From 46c5e82212449d1a2b48a9f9218b26a500927aad Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 16 Aug 2022 16:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E7=BB=93=E7=AE=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 01b6408..8e34b7e 100644
--- a/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java
@@ -67,8 +67,8 @@ public class MonthlySettleController extends BaseController {
     }
 
     @RequestMapping("/infoByTime")
-    public String infoByTime(@RequestParam("time") String time, @RequestParam("projectName") String projectName, Map<String, Object> model) {
-        MonthlySettle monthlySettle = monthlySettleRepository.findByMonthAndProjectName(time, projectName);
+    public String infoByTime(@RequestParam String month, @RequestParam("projectName") String projectName, Map<String, Object> model) {
+        MonthlySettle monthlySettle = monthlySettleRepository.findByMonthAndProjectName(month, projectName);
         model.put("monthlySettle", monthlySettle);
         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 884061d..40dcb13 100644
--- a/src/main/resources/templates/admin/monthly_settle_info.ftl
+++ b/src/main/resources/templates/admin/monthly_settle_info.ftl
@@ -124,7 +124,7 @@
                         <!--验证表单元素（validate) begin-->
 
                         <div class="am-g am-form-group am-margin-top">
-                            <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="月份"></div>
+                            <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="月份(请选择)"></div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input readonly id="time" name="time" value="${monthlySettle.month}"></input>
                             </div>
@@ -378,7 +378,7 @@
                 var projectName = $("#projectName").val();
                 var time = $(this.elem).val();
                 console.log("time:" + time)
-                $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?listFrom=list&projectName=" + projectName + "$time=" + time);
+                $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?projectName=" + projectName + "&month=2022-07&listFrom=list");
                 $("#pmsForm").submit();
             }
         });
diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl
index 54a53e0..382dc45 100644
--- a/src/main/resources/templates/admin/monthly_settle_list.ftl
+++ b/src/main/resources/templates/admin/monthly_settle_list.ftl
@@ -252,6 +252,7 @@
 <script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-process.js"></script>
 <script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-validate.js"></script>
 <script src="../assets/js/amazeui.switch.js"></script>
+<script src="${base}/layui/layui.js"></script>
 <script type="text/javascript">
     // layui.use('laydate', function(){
     //     var laydate = layui.laydate;