From 2bffe498bff8dac76fe1fda57a4d70039af8bde6 Mon Sep 17 00:00:00 2001
From: liuweiwen <529520975@qq.com>
Date: Fri, 7 Feb 2020 18:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E8=AE=B0=E5=BD=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatementMangementController.class.php    |  3 ++
 .../StatementMangement/rewardManageSave.html  | 40 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index fd663c8da..e31bc70ea 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -325,6 +325,9 @@ class StatementMangementController extends ThinkController
                     $data['accounts'] = json_decode($data['accounts'], true) ?: [];
                     $this->assign('data', $data);
                 }
+            } else {
+                $data['reward_time'] = strtotime(date('Y-m-01'));
+                $this->assign('data', $data);
             }
             $this->display();
         }
diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
index 08332f1bf..7c86ec66b 100644
--- a/Application/Admin/View/StatementMangement/rewardManageSave.html
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -62,7 +62,7 @@
             charset="UTF-8"></script>
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
-            class="form-horizontal form_info_ml">
+            class="form-horizontal form_info_ml" id="form">
         <div class="formtitle"><span>奖惩编辑</span></div>
         <ul class="form_info ">
             <input type="hidden" name="id" value="{$data.id}" />
@@ -145,7 +145,10 @@
                 <textarea name="remark" class="" placeholder="备注" >{$data.remark}</textarea>
             </li>
             <li>
-                <label>&nbsp;</label><input type="submit" id="submit" value="确认保存" target-form="form-horizontal" class="form_btn">
+                <label>&nbsp;</label>
+                <button class="submit_btn ajax-post" id="submit" type="submit" target-form="form-horizontal">
+                    确认保存
+                </button>
                 <input type="button"  value="返 回" target-form="form-horizontal" class="form_btn ajax-post" onclick="javascript:void(window.history.go(-1))">
             </li>
         </ul>
@@ -171,18 +174,29 @@
     $(document).on('click', '.bnt_remove', function(){
         $(this).parents('li').remove();
     });
-
-    // $('#reward_time').datetimepicker({
-    //         format: 'yyyy-mm-dd',
-    //         language: "zh-CN",
-    //         minView: 2,
-    //         autoclose: true
-    //     });
-        $('#reward_time').datetimepicker({
-    language:"zh-CN",
-     hour: 13,
-       minute: 15
+    var date = new Date();
+    var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
+    $("#reward_time").datetimepicker({
+        format : "yyyy-mm-dd hh:ii",
+        autoclose : true,
+        todayBtn : true,
+        todayHighlight : true,
+        startDate : monthStart,
+        language : 'zh-CN',
+        startView : 2,//月视图
+        showMeridian : true,
+        pickerPosition : "bottom-left",
+        minuteStep : 5
     });
+
+    /* $('#reward_time').datetimepicker({
+        language:"zh-CN",
+        hour: 13,
+        minute: 15,
+        setStartDate:'2020-02-01',
+        todayHighlight : true,
+        todayBtn:true
+    });*/
     var company_id = '{$data["company_id"]}';
     function companyTypeChange()
     {