更新维修记录表

app/Http/Controllers/Admin/RepairDeviceController.php

@@ -40,8 +40,10 @@ class RepairDeviceController extends BaseController
 
     public function all(Request $request)
     {
+        $status_label = Option::get('inner_devices','status');
+        $inner_device_name = InnerDeviceNamesModel::getOptions();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'all', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'all', compact('model', 'model_name','pre_uri','status_label','inner_device_name'));
     }
 
     public function get(Request $request)
@@ -62,6 +64,23 @@ class RepairDeviceController extends BaseController
                 $items = $items->where($select_item, '=', $request->input($select_item));
             }
         }
+        //查询状态
+        if ($request->input('status_label'))
+        {
+            $items->whereHas('inner_device',function ($query){
+               $query->where('status','=',request('status_label'));
+            });
+        }
+
+        //查询设备名称
+        if ($request->input('inner_device_name'))
+        {
+            $items->whereHas('inner_device',function ($query){
+                $query->whereHas('device_name',function ($query){
+                    $query->where('id','=',request('inner_device_name'));
+                });
+            });
+        }
 
         $items = $items->paginate();
 

app/Models/InnerDeviceNamesModel.php

@@ -35,5 +35,7 @@ class InnerDeviceNamesModel extends BaseModel
                            'sort',
                            'status'
                           ];
-
+    public static function getOptions(){
+            return self::where('id', '>', 0)->orderBy('sort')->get()->toArray();
+    }
 }

resources/views/admin/repair-devices/all.blade.php

@@ -16,7 +16,22 @@
                 <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="inner_device_name">
+                                <option value="0">设备名称</option>
+                                @foreach($inner_device_name as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('inner_device_name') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="status_label">
+                                <option value="0">状态</option>
+                                @foreach($status_label as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('status_label') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">