8. 项目管理 - 工点管理

● 请输入名称提示文字改为请输入工点名称
● 按照ID重新排个序，倒序排序
● 新增一个所属项目下拉框搜索

app/Http/Controllers/Admin/WorkPointController.php

@@ -31,8 +31,9 @@ class WorkPointController extends BaseController
 
     public function index()
     {
+        $project_id = Project::getOptions();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri','project_id'));
     }
 
     public function innerDevices()
@@ -43,7 +44,7 @@ class WorkPointController extends BaseController
 
     public function get(Request $request)
     {
-        $items = $this->model->orderBy('created_at', 'desc');
+        $items = $this->model->orderBy('id', 'desc')->orderBy('created_at', 'desc');
 
         $tmp_items = collect(['name']);
         foreach($tmp_items as $tmp_item) {
@@ -58,7 +59,12 @@ class WorkPointController extends BaseController
                 $items = $items->where($select_item, '=', $request->input($select_item));
             }
         }
-
+        if ($request->input('project_id'))
+        {
+            $items->whereHas('project',function ($query){
+               $query->where('id','=',request('project_id'));
+            });
+        }
         $items = $items->paginate();
 
         foreach ($items as $item) {

resources/views/admin/work-points/index.blade.php

@@ -19,7 +19,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">
@@ -63,7 +73,7 @@
                     cols: [[
                         { field: 'id', title: 'ID', align: 'center' },
                         { field: 'project_name', title: '所属项目', align: 'center' },
-                        { field: 'name', title: '名称', align: 'center' },
+                        { field: 'name', title: '工点名称', align: 'center' },
                         { field: 'status_label', title: '状态', align: 'center' },
                         { title: '操作', align:'center', toolbar: '#sg-table-bar' }
                     ]],