Zhouzhendong 5 rokov pred
rodič
commit
be2842b2e0

+ 2 - 2
app/Http/Controllers/LaborReportController.php

@@ -34,7 +34,7 @@ class LaborReportController extends Controller
     {
         //if(!Gate::allows('人事管理')){ return redirect(url('/'));  }
         if(!Gate::allows('人事管理-临时工报表')){ return redirect(url('/'));  }
-        $request=$request->input();
+        $paginateParams=$request->input();
         $user=Auth::user();
         if (!$user)return redirect('/');
         $userWorkgroupIds=$user->getPermittingWorkgroupIds(Gate::allows('人事管理-临时工报表-可见全部组'));
@@ -64,7 +64,7 @@ class LaborReportController extends Controller
             }
         }
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','request'));
+        return view('personnel/laborReport/index',compact('laborReports','userWorkGroups','laravelEchoPrefix','permittingWorkgroups','paginateParams'));
     }
     public function export(Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }

+ 2 - 2
app/Http/Controllers/PackageController.php

@@ -35,9 +35,9 @@ class PackageController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
-        $request = $request->input();
+        $paginateParams = $request->input();
         $packages = app('packageService')->paginate($request);
-        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'request'=>$request]);
+        return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }
 
     /**

+ 2 - 2
app/Http/Controllers/ProcessController.php

@@ -45,10 +45,10 @@ class ProcessController extends Controller
     public function index(Request $request,OwnerService $ownerService)
     {
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
-        $request = $request->input();
+        $paginateParams = $request->input();
         $processes = app('processService')->paginate($request);
         $owners=$ownerService->getSelection();
-        return view('process.index',['processes'=>$processes,'owners'=>$owners,'request'=>$request]);
+        return view('process.index',['processes'=>$processes,'owners'=>$owners,'paginateParams'=>$paginateParams]);
     }
 
     //获取每日参与人

+ 2 - 2
app/Http/Controllers/WaybillsController.php

@@ -48,13 +48,13 @@ class WaybillsController extends Controller
     public function index(Request $request,OwnerService $ownerService,CarrierService $carrierService)
     {
         if(!Gate::allows('运输管理-查询')){ return redirect(url('/'));  }
-        $request = $request->input();
+        $paginateParams = $request->input();
         $waybills=app('waybillService')->paginate($request);
         return view('waybill.index', [
             'waybills' => $waybills,
             'carriers' => $carrierService->getSelection(),
             'owners' => $ownerService->getSelection(),
-            'request'=>$request,
+            'paginateParams'=>$paginateParams,
             'uriType'=>$request->uriType??'']);
     }
 

+ 1 - 1
resources/views/personnel/laborReport/index.blade.php

@@ -155,7 +155,7 @@
                     </tbody>
                 </table>
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
-        <div>{{$laborReports->appends($request)->links()}}</div>
+        <div>{{$laborReports->appends($paginateParams)->links()}}</div>
         {{--      选择晚饭时长弹框      --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">

+ 1 - 1
resources/views/process/index.blade.php

@@ -467,7 +467,7 @@
                 </tr>
                 </template>
             </table>
-            {{$processes->appends($request)->links()}}
+            {{$processes->appends($paginateParams)->links()}}
         </div>
 </div>
 

+ 1 - 1
resources/views/waybill/index.blade.php

@@ -308,7 +308,7 @@
                 </div>
             </div>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
-            {{$waybills->appends($request)->links()}}
+            {{$waybills->appends($paginateParams)->links()}}
         </div>
     </div>
 

+ 1 - 5
resources/views/weight/package/index.blade.php

@@ -70,11 +70,7 @@
                     </tr>
                 </table>
                 <div class="text-info h5 btn btn">{{$packages->count()}}/{{$packages->total()}}</div>
-                @if(isset($request))
-                    {{$packages->appends($request)->links()}}
-                @else
-                    {{$packages->links()}}
-                @endif
+                {{$packages->appends($paginateParams)->links()}}
             </div>
         </div>
     </div>