更新内部设备筛选字段，和页面跳转

app/Http/Controllers/Admin/InnerDeviceController.php

@@ -44,8 +44,9 @@ class InnerDeviceController extends BaseController
     {
         $options = $this->device_name->getNameSpecOptions();
         $statuses = Option::get('inner_devices', 'status');
+        $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', 'options', 'statuses'));
+        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri', 'options', 'statuses','project_id'));
     }
 
     public function get(Request $request)
@@ -59,7 +60,14 @@ class InnerDeviceController extends BaseController
             }
         }
 
-        $select_items = collect(['device_id', 'device_name_id', 'spec_id', 'status', 'work_point_id']);
+        $spec_items = collect(['spec_name']);
+        foreach($spec_items as $spec_item) {
+            if($request->has($spec_item) && !empty($request->input($spec_item))) {
+                $items = $items->where($spec_item, 'like', '%' . $request->input($spec_item) . '%');
+            }
+        }
+
+        $select_items = collect(['device_id', 'device_name_id', 'spec_id', 'status', 'work_point_id','project_id']);
         foreach($select_items as $select_item) {
             if($request->has($select_item) && !empty($request->input($select_item))) {
                 $items = $items->where($select_item, '=', $request->input($select_item));
@@ -103,11 +111,10 @@ class InnerDeviceController extends BaseController
             return back()->withErrors($validator)->withInput();
         }
         $data = $request->input('data');
-//        dd($data);
         $data = array_merge($data, $request->only(['device_id', 'device_name_id', 'spec_name', 'project_id', 'work_point_id']));
         $res = $this->model->create($data);
         if(empty($res)) return back()->withErrors(['sg_error_info' => '保存失败']);
-        return redirect($this->pre_uri . 'create')->with(['sg_success_info' => '创建成功']);
+        return redirect($this->pre_uri . 'index')->with(['sg_success_info' => '创建成功']);
     }
 
     public function exportTemplate(Request $request)
@@ -139,7 +146,7 @@ class InnerDeviceController extends BaseController
         $data = array_merge($data, $request->only(['device_id', 'device_name_id', 'spec_name', 'project_id', 'work_point_id']));
         $res = $this->model->where('id', $request->input('id'))->update($data);
         if(!$res) return back()->withErrors(['sg_error_info' => '数据库保存失败！']);
-        return back()->with(['sg_success_info' => '编辑成功']);
+        return redirect($this->pre_uri . 'index')->with(['sg_success_info' => '编辑成功']);
     }
 
     public function delete(Request $request)

resources/views/admin/inner-devices/create.blade.php

@@ -31,7 +31,7 @@
                         @include('share.layui-form-item', ['type' => 'input', 'name' => 'manufacturer', 'label' => '生产厂家', 'required' => true, 'value' => (old('data') ? old('data')['manufacturer'] : '')])
                         <div class="layui-form-item">
                             <div class="layui-input-block">
-                                <button class="layui-btn" lay-submit lay-filter="formDemo">提交</button>
+                                <button id="btnSubmit" class="layui-btn" lay-submit lay-filter="formDemo">提交</button>
                                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                             </div>
                         </div>
@@ -60,7 +60,7 @@
                 // });
 
                 $('#sg-back-btn').on('click', function () {
-                    window.history.go(-1)
+                    window.history.go(-1);
                 });
 
                 laydate.render({

resources/views/admin/inner-devices/index.blade.php

@@ -55,7 +55,7 @@
             <div class="sg-search-box">
                 <form class="layui-form" id="sg-search-form">
                     <div class="layui-form-item layui-row" style="margin-bottom: 0">
-                        @include('share.name-select', ['device_name_id' => '', 'spec_id' => '', 'options' => $options])
+                        @include('share.name-select', ['device_name_id' => '', 'options' => $options])
                         <div class="layui-inline">
                             <div class="layui-input-inline">
                                 <select name="status">
@@ -66,11 +66,28 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <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="number" placeholder="请输入固定资产编号" autocomplete="off" class="layui-input" value="{{ request('number') }}">
                             </div>
                         </div>
+
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <input type="text" name="spec_name" placeholder="请输入规格型号" autocomplete="off" class="layui-input" value="{{ request('spec_name') }}">
+                            </div>
+                        </div>
+
                         <div class="layui-inline">
                             <div class="layui-btn" id="sg-search-btn">搜索</div>
                         </div>

resources/views/share/name-select.blade.php

@@ -15,14 +15,14 @@
             </select>
         </div>
     </div>
-    @if(!isset($hide_spec))
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <select name="spec_id" lay-filter="spec_id">
-            </select>
-        </div>
-    </div>
-    @endif
+    {{--@if(!isset($hide_spec))--}}
+    {{--<div class="layui-inline">--}}
+        {{--<div class="layui-input-inline">--}}
+            {{--<select name="spec_id" lay-filter="spec_id">--}}
+            {{--</select>--}}
+        {{--</div>--}}
+    {{--</div>--}}
+    {{--@endif--}}
 </div>
 <script>
     $(function() {