wupengfei 2 years ago
parent
commit
80d41b28f7

+ 5 - 0
application/leave/controller/LeaveInfo.php

@@ -109,6 +109,11 @@ class LeaveInfo extends Controller
      */
     protected function _form_filter(&$data)
     {
+        if($this->request->isGet() && $this->request->action() == 'edit')
+        {
+            $data['start_str'] = $data['start_data'].'--'.$data['start_time'];
+            $data['end_str'] = $data['end_data'].'--'.$data['end_time'];
+        }
 
     }
 

+ 3 - 3
application/leave/view/leave_info/form.html

@@ -9,16 +9,16 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">开始时间</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" value="{$vo.start_date}"/>
+                    <input class="layui-input" value="{$vo.start_str|default=''}"/>
                 </div>
             </div>
         </div>
 
         <div class="layui-card-body">
             <div class="layui-form-item">
-                <label class="layui-form-label">开始结束时间</label>
+                <label class="layui-form-label">结束时间</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" value="{$vo.end_date}"/>
+                    <input class="layui-input" value="{$vo.end_str|default=''}"/>
                 </div>
             </div>
         </div>