1

application/leave/controller/LeaveInfo.php

@@ -1,5 +1,6 @@
 <?php
 namespace app\leave\controller;
+use app\common\model\LeaveApprove;
 use library\Controller;
 use think\Db;
 /**
@@ -104,4 +105,19 @@ class LeaveInfo extends Controller
 
     }
 
+
+
+    public function approve()
+    {
+        $id = input('id');
+        $list = LeaveApprove::field('a.*,u.name')
+            ->where('a.leave_id',$id)
+            ->leftJoin('store_member u','u,id = a.approve_user')
+            ->select()->toArray();
+        $this->assign('list',$list);
+        $this->fetch();
+    }
+
+
+
 }

application/leave/view/leave_info/approve.html

@@ -0,0 +1,37 @@
+{block name="content"}
+<div class="think-box-shadow">
+    <table class="layui-table margin-top-20" lay-skin="line">
+        <thead>
+        <tr>
+            <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>
+        </tr>
+        </thead>
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td class='text-left nowrap'>{$vo.name}</td>
+            <td class='text-left nowrap'>
+                {eq name ='vo.status' value='0'}待审批{/eq}
+                {eq name ='vo.status' value='1'}审批中{/eq}
+                {eq name ='vo.status' value='2'}审批通过{/eq}
+                {eq name ='vo.status' value='3'}审批拒绝{/eq}
+            </td>
+            <td class='text-left nowrap'>{$vo.approve_time|default='--}</td>
+            <td class='text-left nowrap'>{$vo.remark|default='--}</td>
+            <td class='text-left nowrap'>{$vo.time|default='--'}</td>
+
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+</div>
+
+{/block}
+
+
+

application/leave/view/leave_info/form.html

@@ -4,18 +4,12 @@
 <div class="think-box-shadow">
     <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
         <div class="layui-card-body">
-
             <div class="layui-form-item">
                 <label class="layui-form-label label-required">申请时间</label>
                 <div class="layui-input-block">
                     <textarea name="content" rows="10" cols="100">{$vo.reason}</textarea>
                 </div>
             </div>
-
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗？" data-close>取消编辑</button>
-            </div>
         </div>
     </form>
     <script>

application/leave/view/leave_info/index.html

@@ -47,6 +47,7 @@
             </td>
             <td class='text-left' >
                 <a data-title="查看事由" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>查看事由</a>
+                <a data-title="查看审批" class="layui-btn layui-btn-sm" data-modal='{:url("approve")}?id={$vo.id}'>审批记录</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','remove','{$vo.id}');">删 除</span>
             </td>
         </tr>