9. 项目管理 - 申请列表

● 请输入名称提示文字改为请输入用户名称
● 隐藏用户ID
● 按照ID重新排个序，倒序排序
● 新增一个申请项目下拉框搜索

app/Http/Controllers/Admin/ProjectController.php

@@ -40,13 +40,14 @@ class ProjectController extends BaseController
 
     public function applyIndex()
     {
+        $project_id = Project::getOptions();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'apply-index', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'apply-index', compact('model', 'model_name','pre_uri','project_id'));
     }
 
     public function get(Request $request)
     {
-        $items = $this->model->orderBy('created_at', 'desc')->where('id','!=','1');
+        $items = $this->model->where('id','!=','1')->orderBy('id', 'desc')->orderBy('created_at', 'desc');
 
         $tmp_items = collect(['name']);
         foreach($tmp_items as $tmp_item) {
@@ -62,6 +63,11 @@ class ProjectController extends BaseController
             }
         }
 
+        if ($request->input('project_id'))
+        {
+            $items->where('id','=',request('project_id'));
+        }
+
         if($request->input('type') == 'apply') {
             $items = $items->whereNotNull('user_id');
         }

resources/views/admin/projects/apply-index.blade.php

@@ -17,7 +17,17 @@
                 <div class="layui-form-item layui-row">
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" value="{{ request('name') }}">
+                            <select name="project_id">
+                                <option value="0">申请项目</option>
+                                @foreach($project_id as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('project_id') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="text" name="name" placeholder="请输入用户名称" autocomplete="off" class="layui-input" value="{{ request('name') }}">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -55,10 +65,9 @@
                     url: '{{ $pre_uri }}' + 'get',
                     cellMinWidth: 80,
                     cols: [[
-                        { field: 'id', title: 'ID', align: 'center' },
                         { field: 'name', title: '申请项目名称', align: 'center' },
                         { field: 'user_id', title: '用户ID', align: 'center' },
-                        { field: 'user_name', title: '用户姓名', align: 'center' },
+                        { field: 'user_name', title: '用户名称', align: 'center' },
                         { field: 'user_avatar', title: '用户头像', align: 'center' },
                         { field: 'user_phone', title: '用户手机', align: 'center' },
                         { field: 'active_label', title: '项目状态', align: 'center' },