Просмотр исходного кода

入库界面添加备注筛选功能

haozi 5 лет назад
Родитель
Сommit
da80e045b3

+ 2 - 1
app/Http/Controllers/StoreController.php

@@ -29,11 +29,12 @@ class StoreController extends Controller
     {
         if(!Gate::allows('入库管理-入库-查询')){ return redirect(url('/'));  }
         /** @var StoreService $storeService */
+        $paginateParams=$request->input();
         $storeService=app(StoreService::class);
         $stores=$storeService->paginate($request->input());
         $warehouses=Warehouse::query()->get();
         $owners=app("OwnerService")->getIntersectPermitting();
-        return view('store.inStorage.index',compact('stores','warehouses','owners'));
+        return view('store.inStorage.index',compact('stores','warehouses','owners','paginateParams'));
     }
     /**
      * Display a listing of the resource.

+ 1 - 0
app/Services/StoreService.php

@@ -18,6 +18,7 @@ Class StoreService
         $stores = Store::query()->with(['storeItems.store', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');
         $columnQueryRules = [
             'asn_code' => ['like' => ''],
+            'remark' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at', 'endDate' => ' 23:59:59'],
             'owner_id' => ['multi' => ','],

+ 2 - 1
resources/views/store/inStorage/index.blade.php

@@ -60,7 +60,7 @@
                         </tr>
         </table>
         <div class="text-info h5 btn btn">{{$stores->count()}}/{{$stores->total()}}</div>
-        {{$stores->links()}}
+        <div>{{$stores->appends($paginateParams)->links()}}</div>
     </div>
 @endsection
 
@@ -100,6 +100,7 @@
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'warehouse_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表,回车确定','选择要显示的仓库'],
                             placeholder:['仓库','定位或多选仓库'],data:this.warehouses},
+                        {name:'remark',type:'input',tip:'备注:可在两侧增加百分号(%)进行模糊搜索',placeholder: '备注'},
                     ],
                     [
                         {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},