Merge branch 'feature/ylw' into feature/admin_optimize

Application/Admin/Controller/StatementMangementController.class.php

@@ -244,6 +244,7 @@ class StatementMangementController extends ThinkController
                 $item['reward_type_desc'] = $item['reward_type'] == 1 ? "奖励" : "惩罚";
                 $item['company_type_desc'] = $item['company_type'] == 1 ? "上游公司" : "下游公司";
                 $item['relation_game_name'] = $games[$item['relation_game_id']];
+                $item['reward_time'] = date('Y-m-d H:i:s', $item['reward_time']);
                 // if ($item['company_type'] == 1) {
 
                 // } else {
@@ -271,6 +272,7 @@ class StatementMangementController extends ThinkController
                 'money' => I('money'),
                 'content' => I('content'),
                 'remark' => I('remark'),
+                'reward_time' => strtotime(I('reward_time'))
             ];
             $accounts = I('account');
             $user_types = I('user_type');

Application/Admin/View/StatementMangement/rewardManageList.html

@@ -73,6 +73,7 @@
                         <th>事件</th>
                         <th>金额</th>
                         <th>备注</th>
+                        <th>奖罚时间</th>
                         <th>添加人</th>
                         <th>操作</th>
                     </tr>
@@ -102,6 +103,7 @@
                                 <td>{$data.content}</td>
                                 <td>{$data.money}</td>
                                 <td>{$data.remark}</td>
+                                <td>{:date('Y-m-d H:i:s',$data['reward_time'])}</td>
                                 <td>{:get_admin_nickname($data['creater_id'])}</td>
                                 <td>
                                     <a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>

Application/Admin/View/StatementMangement/rewardManageSave.html

@@ -51,6 +51,15 @@
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
     <script src="__STATIC__/layer/extend/layer.ext.js" type="text/javascript"></script>
     <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <php>if(C('COLOR_STYLE')=='blue_color') echo '
+        <link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">
+        ';
+    </php>
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
+            charset="UTF-8"></script>
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
             class="form-horizontal form_info_ml">
@@ -76,6 +85,10 @@
                 <select id="company_id" name="company_id" class="select_gallery">
                 </select>
             </li>
+            <li>
+                <label>奖罚时间</label>
+                <input type="text" id="reward_time" readonly name="reward_time" class="" value="{:date('Y-m-d H:i:s',$data['reward_time'])}" placeholder="奖罚时间" />
+            </li>
             <?php if ($data['accounts']):?>
             <?php foreach ($data['accounts'] as $k => $account):?>
             <?php if ($k == 0):?>
@@ -159,6 +172,17 @@
         $(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 company_id = '{$data["company_id"]}';
     function companyTypeChange()
     {