From 5a80fbf519d87be89f89674434fd97e610c9d2ac Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 18 Nov 2021 16:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E6=80=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9C=88=E4=BB=BD=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_settle_add.ftl    | 48 +++++++++----------
 .../templates/admin/project_settle_edit.ftl   | 28 +++++------
 .../templates/admin/project_statistics.ftl    | 24 +++++++++-
 3 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 19b8104..94a81ab 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -407,38 +407,38 @@
 <script>
     var base = "${base}";
 </script>
-    <script src="${base}/layui/layui.js"></script>
+<#--    <script src="${base}/layui/layui.js"></script>-->
     <script src="${base}/assets/js/project_common.js"></script>
     <script src="${base}/assets/js/project_settle.js"></script>
 <script>
 
-    layui.use('laydate', function(){
-        var laydate = layui.laydate;
-
-        laydate.render({
-            elem: '#time',
-            type: 'month',
-            btns: ['confirm'],
-            trigger: 'click',
-            ready: function(date){
-                console.log(date);
-            }
-        });
-    });
+    // layui.use('laydate', function(){
+    //     var laydate = layui.laydate;
+    //
+    //     laydate.render({
+    //         elem: '#time',
+    //         type: 'month',
+    //         btns: ['confirm'],
+    //         trigger: 'click',
+    //         ready: function(date){
+    //             console.log(date);
+    //         }
+    //     });
+    // });
 
     $(function () {
         calculateSettle();
-            $("#saveSettle").click(function () {
-                $("#pmsForm").attr("action","${base}/project/settle/save");
-                $("#pmsForm").submit();
-            });
-
-            $("#saveApprove").click(function () {
-                $("#pmsForm").attr("action",base+"/project/settle/saveAndApprove");
-                $("#pmsForm").submit();
-            });
-
+        $("#saveSettle").click(function () {
+            $("#pmsForm").attr("action","${base}/project/settle/save");
+            $("#pmsForm").submit();
         });
 
+        $("#saveApprove").click(function () {
+            $("#pmsForm").attr("action",base+"/project/settle/saveAndApprove");
+            $("#pmsForm").submit();
+        });
+
+    });
+
 </script>
 </@defaultLayout.layout>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 84fa0b1..514ca01 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -407,23 +407,23 @@
 <script>
     var base = "${base}";
 </script>
-    <script src="${base}/layui/layui.js"></script>
+<#--    <script src="${base}/layui/layui.js"></script>-->
     <script src="${base}/assets/js/project_common.js"></script>
     <script src="${base}/assets/js/project_settle.js"></script>
 <script>
-    layui.use('laydate', function(){
-        var laydate = layui.laydate;
-
-        laydate.render({
-            elem: '#time',
-            type: 'month',
-            btns: ['confirm'],
-            trigger: 'click',
-            ready: function(date){
-                console.log(date);
-            }
-        });
-    });
+    // layui.use('laydate', function(){
+    //     var laydate = layui.laydate;
+    //
+    //     laydate.render({
+    //         elem: '#time',
+    //         type: 'month',
+    //         btns: ['confirm'],
+    //         trigger: 'click',
+    //         ready: function(date){
+    //             console.log(date);
+    //         }
+    //     });
+    // });
 
     $(function () {
         calculateSettle();
diff --git a/src/main/resources/templates/admin/project_statistics.ftl b/src/main/resources/templates/admin/project_statistics.ftl
index 75674c2..bcb7ff9 100644
--- a/src/main/resources/templates/admin/project_statistics.ftl
+++ b/src/main/resources/templates/admin/project_statistics.ftl
@@ -17,6 +17,7 @@
             <br/>
             <br/>
             <form method="post" class="am-form" id="pmsForm">
+                <input type="hidden" id="keywords" name="keywords" value='${keywords!""}'/>
                 <!--选项卡（tabs）begin-->
                 <div class="am-tabs am-margin" data-am-tabs>
                     <ul class="am-tabs-nav am-nav am-nav-tabs">
@@ -197,11 +198,30 @@
                 type: 'month',
                 btns: ['confirm'],
                 trigger: 'click',
-                ready: function(date){
-                    console.log(date);
+                ready: function(){
+                    console.log($(this.elem).val());
+                },
+                done: function() {
+                    var time = $(this.elem).val();
+                    console.log("time:" + time)
+                    setKeywords(time);
+                    $("#pmsForm").attr("action","${base}/projectSummary/list");
+                    $("#pmsForm").submit();
                 }
             });
         });
+
+        function setKeywords(time) {
+            var keywordsObj = {};
+            keywordsObj.time = time;
+            var keywords = "";
+            if (!$.isEmptyObject(keywordsObj)) {
+                keywords = JSON.stringify(keywordsObj);
+            }
+            console.log("keywords = " + keywords);
+
+            $("#keywords").val(keywords);
+        }
     </script>
 </@defaultLayout.layout>