|
|
@@ -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('/')); }
|