1

application/car/view/car_info/approve.html

@@ -2,17 +2,19 @@
 <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>
+        <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>
+            <th class='text-left nowrap'>审批时长</th>
+        </tr>
         </thead>
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
+            <td class='text-left nowrap'>{$vo.approve_type == 1 ?'审批':'抄送'}</td>
             <td class='text-left nowrap'>{$vo.name}</td>
             <td class='text-left nowrap'>
                 {eq name ='vo.status' value='0'}待审批{/eq}

application/leave/controller/LeaveInfo.php

@@ -31,8 +31,10 @@ class LeaveInfo extends Controller
         $this->title = '列表管理';
         $all_type = \app\common\model\LeaveType::getAllType();
         $this->all_type = array_column($all_type,null,'id');
+        $this->status_arr = [0=>'全部','1'=>'审批中',2=>'审批通过',3=>'审批拒绝',9=>'已取消'];
         $sel_where = [];
         if($type = input('type')) $sel_where[] = ['a.type','=',$type];
+        if($status = input('status')) $sel_where[] = ['a.status','=',$status];
         if($name = input('name')) $sel_where[] = ['u.name','like','%'.$name.'%'];
         $query = $this->_query($this->table)
             ->field('a.*,u.name,u.headimg')

application/leave/view/leave_info/index_search.html

@@ -23,6 +23,21 @@
             </div>
         </div>
 
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">审批状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach $status_arr as $k=>$v}
+                        {if $Think.get.status && $Think.get.status eq $k}
+                            <option selected value="{$k}">{$v}</option>
+                        {else}
+                            <option  value="{$k}">{$v.title}</option>
+                        {/if}
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
 
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>