1

application/leave/controller/LeaveInfo.php

@@ -28,7 +28,13 @@ class LeaveInfo extends Controller
     public function index()
     {
         $this->title = '列表管理';
-        $query = $this->_query($this->table)->where('is_deleted',0)->page();
+        $all_type = \app\common\model\LeaveType::getAllType();
+        $this->all_type = array_column($all_type,null,'id');
+        $query = $this->_query($this->table)
+            ->field('a.*,u.name,u.headimg')
+            ->alias('a')
+            ->leftJoin('store_member u','u.id = a.user_id')
+            ->where('is_deleted',0)->page();
     }
 
     /**

application/leave/view/leave_info/index.html

@@ -9,9 +9,11 @@
     <table class="layui-table margin-top-20" lay-skin="line">
         <thead>
         <tr>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
             <th class='text-left nowrap'>请假员工</th>
             <th class='text-left nowrap'>请假类型</th>
-            <th class='text-left nowrap'>请假事由</th>
             <th class='text-left nowrap'>请假时间</th>
             <th class='text-left nowrap'>审批状态</th>
             <th class="text-left nowrap">操作</th>
@@ -20,16 +22,30 @@
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
-            <td class='text-left nowrap'>{$vo.user_name|default=''}</td>
-            <td class='text-left nowrap'>{$vo.type|default=''}</td>
-            <td class='text-left nowrap'>{$vo.reason|default=''}</td>
+            <td class='list-table-sort-td'><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></td>
+            <td class='text-left nowrap'>
+                <img data-tips-image style="width:60px;height:60px" src="{$vo.headimg|default=''}" class="margin-right-5 text-top">
+                <div class="inline-block">
+                    员工ID：{$vo.user_id|default='--'}<br><br>
+                    员工名称：{$vo.name|default='--'}<br>
+                </div>
+            </td>
+
+            <td class='text-left nowrap'>{$all_type[$vo.type]['title']|default=''}</td>
+            <td class='text-left nowrap'>
+                <div class="inline-block">
+                    开始时间：{$vo.start_date|default='--'}--{$vo.start_time|default='--'}<br><br>
+                    结束时间：{$vo.end_date|default='--'}--{$vo.end_time|default='--'}<br>
+                </div>
+            </td>
+            <td class='text-left nowrap'>
+                {eq name ='vo.status' value='1'}审批中{/eq}
+                {eq name ='vo.status' value='2'}审批通过{/eq}
+                {eq name ='vo.status' value='3'}审批拒绝{/eq}
+                {eq name ='vo.status' value='0'}已取消{/eq}
+            </td>
             <td class='text-left' >
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {if $vo.status == 1}
-                <span class="layui-btn layui-btn-sm layui-btn-warm"  onclick="btn_confirm('禁用','forbidden','{$vo.id}');" >禁 用</span>
-                {else}
-                <span class="layui-btn layui-btn-sm layui-btn-sm"  onclick="btn_confirm('启用','enable','{$vo.id}');">启 用</span>
-                {/if}
+                <a data-title="查看" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','remove','{$vo.id}');">删 除</span>
             </td>
         </tr>