提交

application/api/controller/Common.php

@@ -49,8 +49,8 @@ class Common extends Base
      */
     public function get_type_list()
     {
-        $data = CommonService::get_type_list();
-        $this->success('类型列表', $data);
+        $data = CommonService::get_data();
+        $this->success('类型数据', $data);
     }
 
     /**

application/approve/controller/ApproveFlow.php

@@ -16,9 +16,7 @@
 namespace app\approve\controller;
 
 use app\common\constant\CommonConstant;
-use app\common\constant\EvectionConstant;
-use app\common\constant\LeaveConstant;
-use app\common\constant\MaintainConstant;
+use app\common\service\CommonService;
 use app\common\service\UserService;
 use library\Controller;
 
@@ -56,9 +54,10 @@ class ApproveFlow extends Controller
     public function index()
     {
         $module = input('module');
-        $this->get_item_list = self::get_item_list($module);
+        $this->get_item_list = CommonService::get_item_list($module);
         $this->title = $this->get_module_list[$module].'审批流程';
         $query = $this->_query($this->table)
+            ->field('user_data',true)
             ->where('module',$module);
         $query->page(false);
     }
@@ -99,7 +98,7 @@ class ApproveFlow extends Controller
             if ($this->request->isGet()) {
                 if ($data) {
                     $data['user_data_text'] = json_decode($data['user_data'], true);
-                    $this->get_item_list = self::get_item_list($data['module']);
+                    $this->get_item_list = CommonService::get_item_list($data['module']);
                     $this->user_list = UserService::get_list(1);
                     $this->user_list_json = json_encode($this->user_list, JSON_UNESCAPED_UNICODE);
                 }
@@ -135,23 +134,4 @@ class ApproveFlow extends Controller
         return $this->fetch('', compact("list"));
     }
 
-    /**
-     * 根据模块获取审批流项
-     **/
-    public function get_item_list($module){
-        $get_item_list = [];
-        switch ($module){
-            case CommonConstant::MODULE_5:
-                $get_item_list = EvectionConstant::get_type_list();
-                break;
-            case CommonConstant::MODULE_6:
-                $get_item_list = LeaveConstant::get_time_list();
-                break;
-            case CommonConstant::MODULE_8:
-                $get_item_list = MaintainConstant::get_type_list();
-                break;
-        }
-        return $get_item_list;
-    }
-
 }

application/approve/controller/ApproveInfo.php

@@ -0,0 +1,82 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\approve\controller;
+
+use app\common\constant\CommonConstant;
+use app\common\constant\OfferConstant;
+use app\common\service\CommonService;
+use app\common\service\UserService;
+use app\common\model\ApproveInfo as model;
+use library\Controller;
+
+/**
+ * 审批申请
+ */
+class ApproveInfo extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'ApproveInfo';
+
+    /**
+     * 控制器初始化
+     */
+    protected function initialize()
+    {
+        $this->get_module_list = CommonConstant::get_module_list();
+        $this->get_approve_status_list = CommonConstant::get_approve_status_list();
+        $this->get_degree_list = OfferConstant::get_degree_list();
+    }
+
+    /**
+     * 列表
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index()
+    {
+        $this->module = input('module');
+        $this->title = $this->get_module_list[$this->module].'列表';
+        $this->get_type_list = CommonService::get_type_list($this->module);
+        $this->limit = input('limit');
+        // 分页每页显示记录数
+        $limit = intval($this->request->get('limit', cookie('page-limit')));
+        cookie('page-limit', $limit = $limit >= 10 ? $limit : 20);
+        if ($this->limit > 0) $limit = $this->limit;
+
+        $data = model::field('is_deleted',true)
+            ->where('module',$this->module)
+            ->where('is_deleted',CommonConstant::IS_DELETED_0)
+            ->with([
+                'approveInfoUser' => function ($query) {
+                    $query->field('userid,name,mobile');
+                },
+            ])
+            ->order('id desc')
+            ->paginate($limit)
+            ->toArray();
+        $list = $data['data'];
+        $result = ['page' => ['limit' => intval($limit), 'total' => intval($data['total']), 'pages' => intval($data['last_page']), 'current' => intval($data['current_page'])], 'list' => $list];
+        return $this->fetch('', $result);
+    }
+
+}

application/approve/view/approve_flow/flow.html

@@ -1,5 +1,7 @@
 {extend name='admin@main'}
 
+{block name="button"}{/block}
+
 {block name="content"}
 <div class="think-box-shadow">
     <table class="layui-table margin-top-10" lay-skin="line">
@@ -7,14 +9,14 @@
         <thead>
         <tr>
             <th class='text-left nowrap'>名称</th>
-            <th class="text-center" style="width: 20%">操作</th>
+            <th class="text-center">操作</th>
         </tr>
         </thead>
         {/notempty}
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
-            <td class='text-left'>{$vo|default='--'}</td>
+            <td class='text-left nowrap'>{$vo|default='--'}</td>
             <td class='text-center nowrap'>
                 <a class="layui-btn layui-btn-xs" data-open='{:url("index")}?module={$key}'>编 辑</a>
             </td>

application/approve/view/approve_flow/index.html

@@ -15,7 +15,7 @@
         <tr>
             <th class='text-left nowrap'>审批流类型</th>
             <th class='text-left nowrap'>审批流项</th>
-            <th class="text-center" style="width: 20%">操作</th>
+            <th class="text-center">操作</th>
         </tr>
         </thead>
         {/notempty}

application/approve/view/approve_info/form.html

@@ -0,0 +1,197 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>
+
+{/block}
+
+{block name="content"}
+<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">
+
+            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+            <input type='hidden' value='{$get_user_type_list_json}' id='get_user_type_list_json'>
+            <input type='hidden' value='{$user_list_json}' id='user_list_json'>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">模块</label>
+                <div class="layui-input-block">
+                    <input name="" placeholder="" value="{$get_module_list[$vo.module]}" class="layui-input layui-bg-gray" disabled>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">审批流类型</label>
+                <div class="layui-input-block">
+                    <input name="" placeholder="" value="{$get_type_list[$vo.flow_type]}" class="layui-input layui-bg-gray" disabled>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+
+            {eq name='vo.flow_item' value='0' }
+            {else}
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">审批流项</label>
+                <div class="layui-input-block">
+                    <input name="" placeholder="" value="{$get_item_list[$vo.flow_item]}" class="layui-input layui-bg-gray" disabled>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            {/eq}
+
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">审批层级</label>
+                <div class="layui-input-block"></div>
+            </div>
+            <div class="paramsData">
+                {foreach name="vo.user_data_text" item="val" key="key"}
+                <div class="layui-form-item paramsItem{$key}">
+                    <label class="layui-form-label">第{$key+1}级：</label>
+                    <div class="layui-input-block">
+                        <div class="layui-input-inline">
+                            <select class="layui-select select1" name="user_data[{$key}][user_type]"
+                                    id="c-user_type-{$key}" lay-filter="user_type">
+                                {foreach $get_user_type_list as $kk=>$vv}
+                                {eq name='val.user_type' value='$kk.""'}
+                                <option selected value="{$kk}">{$vv}</option>
+                                {else}
+                                <option value="{$kk}">{$vv}</option>
+                                {/eq}
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="layui-input-inline paramsItemvalue paramsItemvalue{$key}" {eq name='val.user_type' value='1'}style="display:none" {/eq}>
+                            <select class="layui-select select2" name="user_data[{$key}][userid]" id="c-userid-{$key}">
+                                <option value="">请选择员工</option>
+                                {foreach $user_list as $k=>$v}
+                                {eq name='val.userid' value='$v.userid.""'}
+                                <option selected value="{$v.userid}">{$v.name}</option>
+                                {else}
+                                <option value="{$v.userid}">{$v.name}</option>
+                                {/eq}
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="layui-input-inline">
+                            <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('{$key}');">删除</button>
+                        </div>
+                    </div>
+                </div>
+                {/foreach}
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7"></label>
+                <div class="layui-input-block">
+                    <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" onclick="addParams();">+ 添加审批层级</button>
+                </div>
+            </div>
+        </div>
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>
+<script>
+    window.form.render();
+</script>
+</div>
+{/block}
+{block name="style"}{/block}
+{block name='script'}
+<script>
+
+    form.on('select(user_type)', function(data){
+        var str = data.elem.id;
+        var arr = str.split("-");
+        var key = arr[2];
+        console.log(arr);
+        if(data.value == 1){
+            $('.paramsItemvalue'+key).hide();
+        } else{
+            $('.paramsItemvalue'+key).show();
+        }
+    });
+
+    function addParams() {
+        var length = $('.paramsData').children().length;
+        var key = length;
+        var count = length+1;
+        var get_user_type_list_json = $.parseJSON($("#get_user_type_list_json").val());
+        var get_user_type_list_html = "";
+        var get_user_type_list_html2 = "";
+        var get_user_list_json = $.parseJSON($("#user_list_json").val());
+        var get_user_list_html = "";
+        var get_user_list_html2 = "";
+        $.each(get_user_type_list_json,function (index,element) {
+            get_user_type_list_html += '<option value='+index+'>'+element+'</option>';
+            if(index == 1){
+                get_user_type_list_html2 += '<dd lay-value='+index+' class="layui-this">'+element+'</dd>';
+            } else{
+                get_user_type_list_html2 += '<dd lay-value='+index+' class="">'+element+'</dd>';
+            }
+        })
+        $.each(get_user_list_json,function (index,element) {
+            get_user_list_html += '<option value='+element.userid+'>'+element.name+'</option>';
+            get_user_list_html2 += '<dd lay-value='+element.userid+' class="">'+element.name+'</dd>';
+        })
+        var html = '<div class="layui-form-item paramsItem'+key+'"> ' +
+            '<label class="layui-form-label">第'+count+'级：</label> ' +
+            '<div class="layui-input-block"> ' +
+            '<div class="layui-input-inline"> ' +
+            '<select class="layui-select select1" name="user_data['+key+'][user_type]" id="c-user_type-'+key+'" lay-filter="user_type">'+get_user_type_list_html+'</select> ' +
+            '<div class="layui-unselect layui-form-select">' +
+            '<div class="layui-select-title">' +
+            '<input type="text" placeholder="请选择" value="负责人主管" readonly="" class="layui-input layui-unselect">' +
+            '<i class="layui-edge"></i>' +
+            '</div> ' +
+            '<dl class="layui-anim layui-anim-upbit">'+get_user_type_list_html2+'</dl>' +
+            '</div>'+
+            '</div> ' +
+            '<div class="layui-input-inline paramsItemvalue paramsItemvalue'+key+'" style="display:none"> ' +
+            '<select class="layui-select select2" name="user_data['+key+'][userid]" id="c-userid-'+key+'"><option value="">请选择员工</option> ' +get_user_list_html+' </select> ' +
+            '<div class="layui-unselect layui-form-select">' +
+            '<div class="layui-select-title">' +
+            '<input type="text" placeholder="请选择员工" value="" readonly="" class="layui-input layui-unselect">' +
+            '<i class="layui-edge"></i>' +
+            '</div> ' +
+            '<dl class="layui-anim layui-anim-upbit">'+get_user_list_html2+'</dl>' +
+            '</div>'+
+            '</div> ' +
+            '<div class="layui-input-inline"> ' +
+            '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('+key+');">删除</button> ' +
+            '</div> ' +
+            '</div> ' +
+            '</div>';
+        $(".paramsData").append(html);
+        form.render();
+    }
+    
+    function delParams(key) {
+        var length = $('.paramsData').children().length;
+        var count = length-1;
+        console.log(length);
+        if(key > 0 && key == count){
+            //删除的是最后一步(不是唯一一步)
+            $(".paramsItem" + key).remove();
+        } else{
+            //删除的是中间的一步，所有步骤序号重新排列
+            $(".paramsItem" + key).remove();
+            for(var i=key;i < length;i++){
+                var ii = i-1;
+                $(".paramsData .layui-form-item").eq(ii).attr("class","layui-form-item paramsItem"+ii);
+                $(".paramsData .layui-form-item").eq(ii).find(".layui-form-label").html("第"+i+"级：");
+                $(".paramsData .layui-form-item").eq(ii).find(".select1").attr("id","c-user_type-"+ii);
+                $(".paramsData .layui-form-item").eq(ii).find(".select1").attr('name',"user_data["+ii+"][user_type]");
+                $(".paramsData .layui-form-item").eq(ii).find(".select2").attr("id","c-userid-"+ii);
+                $(".paramsData .layui-form-item").eq(ii).find(".select2").attr('name',"user_data["+ii+"][userid]");
+                $(".paramsData .layui-form-item").eq(ii).find(".paramsItemvalue").attr("class","layui-input-inline paramsItemvalue paramsItemvalue"+ii);
+                $(".paramsData .layui-form-item").eq(ii).find(".layui-btn-danger").attr("onclick","delParams("+ii+");");
+            }
+        }
+    }
+</script>
+{/block}

application/approve/view/approve_info/index.html

@@ -0,0 +1,26 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+<!--<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>-->
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {switch module}
+    {case 1} {include file='approve_info/index_1'} {/case}
+    {case 2} {include file='approve_info/index_2'} {/case}
+    {case 3} {include file='approve_info/index_3'} {/case}
+    {case 4} {include file='approve_info/index_4'} {/case}
+    {case 5} {include file='approve_info/index_5'} {/case}
+    {case 6} {include file='approve_info/index_6'} {/case}
+    {case 7} {include file='approve_info/index_7'} {/case}
+    {case 8} {include file='approve_info/index_8'} {/case}
+    {case 9} {include file='approve_info/index_9'} {/case}
+    {case 10} {include file='approve_info/index_10'} {/case}
+    {case 11} {include file='approve_info/index_11'} {/case}
+    {default /}
+    {/switch}
+</div>
+{/block}

application/approve/view/approve_info/index_1.html

@@ -0,0 +1,37 @@
+{include file='approve_info/index_search_1'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>申请事由</th>
+        <th class='text-left nowrap'>申购类型</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_10.html

@@ -0,0 +1,37 @@
+{include file='approve_info/index_search_10'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>文件名称</th>
+        <th class='text-left nowrap'>来文单位</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$vo.desc}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_11.html

@@ -0,0 +1,38 @@
+{include file='approve_info/index_search_11'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>文件名称</th>
+        <th class='text-left nowrap'>拟发文时间</th>
+        <th class='text-left nowrap'>缓急程度</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_2.html

@@ -0,0 +1,37 @@
+{include file='approve_info/index_search_2'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>申请标题</th>
+        <th class='text-left nowrap'>呈批类型</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_3.html

@@ -0,0 +1,33 @@
+{include file='approve_info/index_search_3'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_4.html

@@ -0,0 +1,35 @@
+{include file='approve_info/index_search_4'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>物品用途</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_5.html

@@ -0,0 +1,39 @@
+{include file='approve_info/index_search_5'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>出差事由</th>
+        <th class='text-left nowrap'>出差类型</th>
+        <th class='text-left nowrap'>出差时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_6.html

@@ -0,0 +1,39 @@
+{include file='approve_info/index_search_6'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>请假原因</th>
+        <th class='text-left nowrap'>请假类型</th>
+        <th class='text-left nowrap'>请假时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.start_time} - {$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_7.html

@@ -0,0 +1,39 @@
+{include file='approve_info/index_search_7'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>出发地点</th>
+        <th class='text-left nowrap'>出发时间</th>
+        <th class='text-left nowrap'>返回时间</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$vo.start_time}</td>
+        <td class='text-left nowrap'>{$vo.end_time}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_8.html

@@ -0,0 +1,39 @@
+{include file='approve_info/index_search_8'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>维修地点</th>
+        <th class='text-left nowrap'>维修类型</th>
+        <th class='text-left nowrap'>具体内容</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_type_list[$vo.type]}</td>
+        <td class='text-left nowrap'>{$vo.desc}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_9.html

@@ -0,0 +1,37 @@
+{include file='approve_info/index_search_9'}
+<table class="layui-table margin-top-10" lay-skin="line">
+    {notempty name='list'}
+    <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>
+        <th class='text-left nowrap'>合同编号</th>
+        <th class='text-left nowrap'>缓急程度</th>
+        <th class="text-center nowrap">操作</th>
+    </tr>
+    </thead>
+    {/notempty}
+    <tbody>
+    {foreach $list as $key=>$vo}
+    <tr>
+        <td class='text-left nowrap'>
+            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+        </td>
+        <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
+        <td class='text-left nowrap'>{$vo.create_at}</td>
+        <td class='text-left nowrap'>{$vo.order_no}</td>
+        <td class='text-left nowrap'>{$vo.apply_date}</td>
+        <td class='text-left nowrap'>{$vo.reason}</td>
+        <td class='text-left nowrap'>{$get_degree_list[$vo.desc]}</td>
+        <td class='text-center nowrap'>
+            <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
+        </td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+{empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}

application/approve/view/approve_info/index_search_1.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_10.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_11.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_2.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_3.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_4.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_5.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_6.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_7.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_8.html

@@ -0,0 +1 @@
+

application/approve/view/approve_info/index_search_9.html

@@ -0,0 +1 @@
+

application/common/constant/ApplyConstant.php

@@ -8,7 +8,7 @@ namespace app\common\constant;
 class ApplyConstant
 {
 
-    // 采购类型:1=货物采购,2=工程采购,3=服务采购
+    // 申购类型:1=货物采购,2=工程采购,3=服务采购
     const TYPE_1 = '1';
     const TYPE_2 = '2';
     const TYPE_3 = '3';

application/common/constant/ContractConstant.php

@@ -3,7 +3,7 @@
 namespace app\common\constant;
 
 /**
- * 呈批常量类
+ * 合同呈批常量类
  */
 class ContractConstant
 {

application/common/model/ApproveInfo.php

@@ -72,4 +72,10 @@ class ApproveInfo extends Model
         return $this->hasMany(ApproveEvectionPeerUser::class, 'info_id', 'id');
     }
 
+    // 关联用户 (后台)
+    public function approveInfoUser()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'userid');
+    }
+
 }

application/common/service/CommonService.php

@@ -18,36 +18,6 @@ class CommonService
 {
 
     /**
-     * 类型数据
-     *
-     * @Apidoc\Method("POST")
-     * @Apidoc\Returned("module_list", type="array", desc="模块列表")
-     * @Apidoc\Returned("degree_list", type="array", desc="缓急程度列表")
-     * @Apidoc\Returned("pay_type_list", type="array", desc="采购支付方式列表")
-     * @Apidoc\Returned("time_list", type="array", desc="请假周期列表")
-     * @Apidoc\Returned("data1", type="array", desc="采购类型列表")
-     * @Apidoc\Returned("data2", type="array", desc="呈批类型列表")
-     * @Apidoc\Returned("data5", type="array", desc="出差类型列表")
-     * @Apidoc\Returned("data6", type="array", desc="请假类型列表")
-     * @Apidoc\Returned("data8", type="array", desc="维修类型列表")
-     * @Apidoc\Returned("data9", type="array", desc="合同类型列表")
-     */
-    public static function get_type_list()
-    {
-        $module_list = get_one_two_array(CommonConstant::get_module_list(), 'id', 'name');
-        $degree_list = get_one_two_array(OfferConstant::get_degree_list(), 'id', 'name');
-        $pay_type_list = get_one_two_array(ApplyConstant::get_pay_type_list(), 'id', 'name');
-        $time_list = get_one_two_array(LeaveConstant::get_time_list(), 'id', 'name');
-        $data1 = get_one_two_array(ApplyConstant::get_type_list(), 'id', 'name');
-        $data2 = get_one_two_array(OfferConstant::get_type_list(), 'id', 'name');
-        $data5 = get_one_two_array(EvectionConstant::get_type_list(), 'id', 'name');
-        $data6 = get_one_two_array(LeaveConstant::get_type_list(), 'id', 'name');
-        $data8 = get_one_two_array(MaintainConstant::get_type_list(), 'id', 'name');
-        $data9 = get_one_two_array(ContractConstant::get_type_list(), 'id', 'name');
-        return compact("module_list", "degree_list", "pay_type_list", "time_list", "data1", "data2", "data5", "data6", "data8", "data9");
-    }
-
-    /**
      * 拼接查询字段
      *
      * @param string $field
@@ -74,4 +44,72 @@ class CommonService
         return false;
     }
 
+    /**
+     * 类型数据
+     */
+    public static function get_data()
+    {
+        $module_list = get_one_two_array(CommonConstant::get_module_list(), 'id', 'name');
+        $degree_list = get_one_two_array(OfferConstant::get_degree_list(), 'id', 'name');
+        $pay_type_list = get_one_two_array(ApplyConstant::get_pay_type_list(), 'id', 'name');
+        $time_list = get_one_two_array(LeaveConstant::get_time_list(), 'id', 'name');
+        $data1 = get_one_two_array(ApplyConstant::get_type_list(), 'id', 'name');
+        $data2 = get_one_two_array(OfferConstant::get_type_list(), 'id', 'name');
+        $data5 = get_one_two_array(EvectionConstant::get_type_list(), 'id', 'name');
+        $data6 = get_one_two_array(LeaveConstant::get_type_list(), 'id', 'name');
+        $data8 = get_one_two_array(MaintainConstant::get_type_list(), 'id', 'name');
+        $data9 = get_one_two_array(ContractConstant::get_type_list(), 'id', 'name');
+        return compact("module_list", "degree_list", "pay_type_list", "time_list", "data1", "data2", "data5", "data6", "data8", "data9");
+    }
+
+    /**
+     * 根据模块获取审批流项
+     *
+     * @param integer $module
+     **/
+    public static function get_item_list($module){
+        $get_item_list = [];
+        switch ($module){
+            case CommonConstant::MODULE_5:
+                $get_item_list = EvectionConstant::get_type_list();
+                break;
+            case CommonConstant::MODULE_6:
+                $get_item_list = LeaveConstant::get_time_list();
+                break;
+            case CommonConstant::MODULE_8:
+                $get_item_list = MaintainConstant::get_type_list();
+                break;
+        }
+        return $get_item_list;
+    }
+
+    /**
+     * 根据模块获取类型列表
+     *
+     * @param integer $module
+     **/
+    public static function get_type_list($module){
+        $list = [];
+        switch ($module) {
+            case CommonConstant::MODULE_1:
+                $list = ApplyConstant::get_type_list();
+                break;
+            case CommonConstant::MODULE_2:
+                $list = OfferConstant::get_type_list();
+                break;
+            case CommonConstant::MODULE_5:
+                $list = EvectionConstant::get_type_list();
+                break;
+            case CommonConstant::MODULE_6:
+                $list = LeaveConstant::get_type_list();
+                break;
+            case CommonConstant::MODULE_8:
+                $list = MaintainConstant::get_type_list();
+            break;
+            case CommonConstant::MODULE_9:
+                $list = ContractConstant::get_type_list();
+                break;
+        }
+        return $list;
+    }
 }

application/user/controller/Department.php

@@ -55,10 +55,12 @@ class Department extends Controller
      */
     protected function _index_page_filter(&$data)
     {
-        foreach ($data as &$vo) {
-            $vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id']));
+        if($data) {
+            foreach ($data as &$vo) {
+                $vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id']));
+            }
+            $data = Data::arr2table($data);
         }
-        $data = Data::arr2table($data);
     }
 
 }

application/user/controller/Member.php

@@ -55,7 +55,7 @@ class Member extends Controller
         $signature_status = input('signature_status');
         $this->title = '员工列表';
         $query = $this->_query($this->table)
-            ->field('is_deleted,create_at',true)
+            ->field('is_deleted',true)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->when(array_key_exists($status, $this->get_status_list), function ($query) use ($status) {
                 $query->where('status', $status);

application/user/view/department/index.html

@@ -1,5 +1,7 @@
 {extend name='admin@main'}
 
+{block name="button"}{/block}
+
 {block name="content"}
 <div class="think-box-shadow">
     {include file='department/index_search'}
@@ -15,8 +17,8 @@
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
-            <td class='text-left'>{$vo.id|default='--'}</td>
-            <td class="text-left"><span class="color-desc">{$vo.spl|raw}</span>{$vo.name|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.id|default='--'}</td>
+            <td class="text-left nowrap"><span class="color-desc">{$vo.spl|raw}</span>{$vo.name|default='--'}</td>
         </tr>
         {/foreach}
         </tbody>

application/user/view/member/form.html

@@ -20,7 +20,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label color-green font-w7">头像</label>
                         <div class="layui-input-block">
-                            <img src="{$vo.avatar}" style="width: 100px;height: 100px;object-fit: cover;">
+                            <img data-tips-image src="{$vo.avatar}" style="width: 100px;height: 100px;vertical-align:top">
                             <p class="help-block"></p>
                         </div>
                     </div>
@@ -92,7 +92,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label color-green font-w7">个人签名</label>
                         <div class="layui-input-block">
-                            <img src="{$vo.signature}" style="width: 300px;height: 300px;object-fit: cover;">
+                            <img data-tips-image src="{$vo.signature}" style="height: 300px;vertical-align:top">
                             <p class="help-block"></p>
                         </div>
                     </div>

application/user/view/member/index.html

@@ -23,7 +23,7 @@
                 <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
             </th>
             <th class='list-table-sort-td'>
-                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+                <button type="button" class="layui-btn layui-btn-xs" data-reload >刷 新</button>
             </th>
             <th class='text-left nowrap'>头像地址</th>
             <th class='text-left nowrap'>昵称</th>
@@ -34,7 +34,7 @@
             <th class='text-left nowrap'>直属主管</th>
             <th class='text-left nowrap'>状态</th>
             <th class='text-left nowrap'>签名状态</th>
-            <th class="text-left">操作</th>
+            <th class="text-left nowrap">操作</th>
         </tr>
         </thead>
         {/notempty}
@@ -46,22 +46,20 @@
             </td>
             <td class='text-left nowrap'></td>
             <td class='text-left nowrap'>
-                {notempty name='vo.avatar'}
-                <img data-tips-image style="width:25px;height:25px;vertical-align:top" src="{$vo.avatar|default=''}" class="margin-right-5">
-                {/notempty}
+                <img data-tips-image style="width:50px;height:50px;vertical-align:top" src="{$vo.avatar|default=''}">
             </td>
-            <td class='text-left'>{$vo.nickname|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.nickname|default='--'}</td>
             <td class='text-left nowrap'>
                 <div class="inline-block">{$vo.name|default=''}</div>
             </td>
-            <td class='text-left'>{$vo.mobile|default='--'}</td>
-            <td class='text-left'>{$vo.title|default='--'}</td>
-            <td class='text-left'>{$vo.department_text|default='--'}</td>
-            <td class='text-left'>{$vo.manager_text|default='--'}</td>
-            <td class='text-left'>
+            <td class='text-left nowrap'>{$vo.mobile|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.title|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.department_text|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.manager_text|default='--'}</td>
+            <td class='text-left nowrap'>
                 {eq name='vo.status' value='0'}<strong class="color-red">已禁用</strong>{else}<strong class="color-green">正常</strong>{/eq}
             </td>
-            <td class='text-left'>
+            <td class='text-left nowrap'>
                 <strong>{$get_signature_status_list[$vo.signature_status]}</strong>
             </td>
             <td class='text-left nowrap'>
@@ -70,11 +68,12 @@
                 {elseif auth("resume")}
                 <a class="layui-btn layui-btn-xs layui-bg-blue" data-confirm="确定要启用该账号吗？" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('resume')}">启 用</a>
                 {/if}
-                <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详情</a>
+                <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详 情</a>
 <!--                <a class="layui-btn layui-btn-xs" data-modal="{:url('edit')}?id={$vo.id}">详情</a>-->
                 {if $vo.signature_status eq 2}
                 <br/>
                 <a class="layui-btn layui-btn-xs layui-bg-blue" data-confirm="确定要审核通过吗？" data-action="{:url('signature_status')}" data-value="id#{$vo.id};signature_status#3" data-csrf="{:systoken('signature_status')}">签名审核通过</a>
+                <br/>
                 <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要审核驳回吗？" data-action="{:url('signature_status')}" data-value="id#{$vo.id};signature_status#4" data-csrf="{:systoken('signature_status')}">签名审核驳回</a>
                 {/if}
             </td>

application/user/view/member/index_search.html

@@ -1,7 +1,6 @@
 <fieldset>
     <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false"
-          method="get" autocomplete="off">
+    <form class="layui-form layui-form-pane form-search" onsubmit="return false" action="{:request()->url()}" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户姓名</label>
             <div class="layui-input-inline">
@@ -52,8 +51,7 @@
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出
-            </button>
+            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
         </div>
     </form>
     <script>