提交

application/api/controller/Member.php

@@ -39,6 +39,7 @@ class Member extends Base
         $user = $this->user;
         unset($user['status'],$user['is_deleted'],$user['create_at']);
         $user['department_list'] = Department::field('dept_id,name')->where('dept_id', 'in', $user['department'])->select();
+        $user['subject_image'] = 'https://static-legacy.dingtalk.com/media/lADPDgfLSTijRwbNA0jNAlg_600_840.jpg';
         $user['subject'] = '学校名称';
         $this->success('获取成功', $user);
     }

application/approve/controller/ApproveFlow.php

@@ -33,6 +33,15 @@ class ApproveFlow extends Controller
     protected $table = 'ApproveFlow';
 
     /**
+     * 控制器初始化
+     */
+    protected function initialize()
+    {
+        $this->get_module_list = CommonConstant::get_module_list();
+        $this->get_type_list = CommonConstant::get_type_list();
+    }
+
+    /**
      * 列表
      * @auth true
      * @menu true
@@ -44,21 +53,7 @@ class ApproveFlow extends Controller
     public function index()
     {
         $module = input('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;
-        }
-        $this->get_item_list = $get_item_list;
-        $this->get_type_list = CommonConstant::get_type_list();
-        $this->get_module_list = CommonConstant::get_module_list();
+        $this->get_item_list = self::get_item_list($module);
         $this->title = $this->get_module_list[$module].'审批流程';
         $query = $this->_query($this->table)
             ->where('module',$module);
@@ -76,6 +71,7 @@ class ApproveFlow extends Controller
         }
     }
 
+
     /**
      * 编辑
      * @auth true
@@ -87,9 +83,7 @@ class ApproveFlow extends Controller
     }
 
     /**
-     * 数据处理
-     * @auth true
-     * @menu true
+     * 表单处理
      * @param array $data
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -98,6 +92,7 @@ class ApproveFlow extends Controller
     protected function _form_filter(&$data)
     {
         if($this->request->isGet()) {
+//            return false;
 //            $this->all_user = User::where('is_deleted',0)->column('name','id');
         }
     }
@@ -111,4 +106,21 @@ class ApproveFlow extends Controller
         $list = CommonConstant::get_module_list();
         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/view/approve_flow/form.html

@@ -4,7 +4,6 @@
 <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">

application/user/controller/Department.php

@@ -43,8 +43,8 @@ class Department extends Controller
     {
         $this->title = '部门列表';
         $query = $this->_query($this->table)
-            ->where('is_deleted',CommonConstant::IS_DELETED_0)
-            ->field('dept_id as id,name,parent_id as pid');
+            ->field('dept_id as id,name,parent_id as pid')
+            ->where('is_deleted',CommonConstant::IS_DELETED_0);
         $query->page(false);
     }
 
@@ -60,4 +60,5 @@ class Department extends Controller
         }
         $data = Data::arr2table($data);
     }
+
 }

application/user/controller/Member.php

@@ -31,6 +31,15 @@ class Member extends Controller
     protected $table = 'StoreMember';
 
     /**
+     * 控制器初始化
+     */
+    protected function initialize()
+    {
+        $this->get_status_list = CommonConstant::get_status_list();
+        $this->get_signature_status_list = CommonConstant::get_signature_status_list();
+    }
+
+    /**
      * 列表
      * @auth true
      * @menu true
@@ -43,8 +52,6 @@ class Member extends Controller
     {
         $status = input('status');
         $signature_status = input('signature_status');
-        $this->get_status_list = CommonConstant::get_status_list();
-        $this->get_signature_status_list = CommonConstant::get_signature_status_list();
         $this->title = '员工列表';
         $query = $this->_query($this->table)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
@@ -54,7 +61,7 @@ class Member extends Controller
             ->when(array_key_exists($signature_status, $this->get_signature_status_list), function ($query) use ($signature_status) {
                 $query->where('signature_status', $signature_status);
             })
-            ->like('name,mobile');
+            ->like('name,mobile,title');
         $query->page();
     }
 
@@ -68,13 +75,13 @@ class Member extends Controller
         $department_list = Department::column('dept_id,name');
         foreach ($data as &$value) {
             $department_ids = explode(',',$value['department']);
-            $department = '';
+            $department_text = '';
             foreach ($department_ids as $val){
                 if(array_key_exists($val,$department_list)){
-                    $department .= $department_list[$val].'，';
+                    $department_text .= $department_list[$val].'，';
                 }
             }
-            $value['department_text'] = $department;
+            $value['department_text'] = $department_text;
         }
     }
 

application/user/view/member/index.html

@@ -3,11 +3,11 @@
 {block name="button"}
 
 {if auth("resume")}
-<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量启用吗？" data-action='{:url("resume")}' data-csrf="{:systoken('resume')}" data-rule="id#{key}">批量启用</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量启用吗？" data-action="{:url('resume')}" data-rule="id#{key}" data-csrf="{:systoken('resume')}">批量启用</button>
 {/if}
 
 {if auth("forbid")}
-<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量禁用吗？" data-action="{:url('forbid')}" data-csrf="{:systoken('forbid')}" data-rule="id#{key}">批量禁用</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量禁用吗？" data-action="{:url('forbid')}" data-rule="id#{key}" data-csrf="{:systoken('forbid')}">批量禁用</button>
 {/if}
 
 {/block}
@@ -26,14 +26,13 @@
                 <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>
             <th class='text-left nowrap'>所属部门</th>
             <th class='text-left nowrap'>状态</th>
             <th class='text-left nowrap'>签名状态</th>
-<!--            <th class='text-left nowrap' style="width: 20%">所属部门</th>-->
             <th class="text-center" style="width: 20%">操作</th>
         </tr>
         </thead>
@@ -63,7 +62,6 @@
             <td class='text-left'>
                 <strong>{$get_signature_status_list[$vo.signature_status]}</strong>
             </td>
-<!--            <td class='text-left'>{$vo.department|default='&#45;&#45;'}</td>-->
             <td class='text-center nowrap'>
                 {if $vo.status eq 1 and auth("forbid")}
                 <a class="layui-btn layui-btn-xs layui-btn-warm" data-confirm="确定要禁用该账号吗？" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('forbid')}">禁 用</a>

application/user/view/member/index_search.html

@@ -15,6 +15,12 @@
             </div>
         </div>
         <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">职位</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入职位" class="layui-input">
+            </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">