diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php index debcac5..7977476 100644 --- a/app/Admin/Controllers/Hr/EmployeeController.php +++ b/app/Admin/Controllers/Hr/EmployeeController.php @@ -17,10 +17,11 @@ class EmployeeController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ - $this->createTypeButton('drawer', 'lg')->visible(Admin::user()->can('admin.hr.employees.create')), + $this->createTypeButton('drawer', 'lg')->visible($user->can('admin.hr.employees.create')), ...$this->baseHeaderToolBar(), $this->exportAction(true)->visible($user->can('admin.hr.employees.export')), ]) @@ -44,16 +45,16 @@ class EmployeeController extends AdminController amisMake()->TableColumn()->name('remarks')->label(__('employee.remarks')), amis()->TableColumn()->name('is_sign')->label(__('employee.is_sign'))->type('switch'), $this->rowActions([ - $this->rowShowButton()->visible(Admin::user()->can('admin.hr.employees.view')), - $this->rowEditTypeButton('drawer', 'lg')->visible(Admin::user()->can('admin.hr.employees.update')), - $this->rowDeleteButton()->visible(Admin::user()->can('admin.hr.employees.delete')), + $this->rowShowButton()->visible($user->can('admin.hr.employees.view')), + $this->rowEditTypeButton('drawer', 'lg')->visible($user->can('admin.hr.employees.update')), + $this->rowDeleteButton()->visible($user->can('admin.hr.employees.delete')), amisMake()->AjaxAction() ->label(__('employee.leave')) ->level('link') ->icon('fa fa-sign-out') ->confirmText(__('employee.leave_confirm')) ->api('post:'.admin_url('hr/employees/${id}/leave')) - ->visible(Admin::user()->can('admin.hr.employees.leave')) + ->visible($user->can('admin.hr.employees.leave')) ->visibleOn('${employee_status == '.EmployeeStatus::Online->value.'}'), amisMake()->AjaxAction() ->label(__('employee.reback')) @@ -61,7 +62,7 @@ class EmployeeController extends AdminController ->icon('fa fa-sign-out') ->confirmText(__('employee.leave_confirm')) ->api('post:'.admin_url('hr/employees/${id}/leave')) - ->visible(Admin::user()->can('admin.hr.employees.leave')) + ->visible($user->can('admin.hr.employees.leave')) ->visibleOn('${employee_status == '.EmployeeStatus::Offline->value.'}'), ]), ]); diff --git a/app/Admin/Controllers/Hr/HolidayController.php b/app/Admin/Controllers/Hr/HolidayController.php index 607f1f8..409b5b8 100644 --- a/app/Admin/Controllers/Hr/HolidayController.php +++ b/app/Admin/Controllers/Hr/HolidayController.php @@ -22,6 +22,7 @@ class HolidayController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ diff --git a/app/Admin/Controllers/Hr/OfficalBusinessController.php b/app/Admin/Controllers/Hr/OfficalBusinessController.php index b82fc3b..c304196 100644 --- a/app/Admin/Controllers/Hr/OfficalBusinessController.php +++ b/app/Admin/Controllers/Hr/OfficalBusinessController.php @@ -22,6 +22,7 @@ class OfficalBusinessController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ diff --git a/app/Admin/Controllers/Hr/OvertimeController.php b/app/Admin/Controllers/Hr/OvertimeController.php index 5a728cc..f3128a8 100644 --- a/app/Admin/Controllers/Hr/OvertimeController.php +++ b/app/Admin/Controllers/Hr/OvertimeController.php @@ -22,6 +22,7 @@ class OvertimeController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ diff --git a/app/Admin/Controllers/Hr/PromotionController.php b/app/Admin/Controllers/Hr/PromotionController.php index 8129dca..8328cca 100644 --- a/app/Admin/Controllers/Hr/PromotionController.php +++ b/app/Admin/Controllers/Hr/PromotionController.php @@ -21,6 +21,7 @@ class PromotionController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ diff --git a/app/Admin/Controllers/Hr/SignController.php b/app/Admin/Controllers/Hr/SignController.php index 766b27e..d483a00 100644 --- a/app/Admin/Controllers/Hr/SignController.php +++ b/app/Admin/Controllers/Hr/SignController.php @@ -20,6 +20,7 @@ class SignController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([ diff --git a/app/Admin/Controllers/Hr/SignRepairController.php b/app/Admin/Controllers/Hr/SignRepairController.php index 74c9892..6255e69 100644 --- a/app/Admin/Controllers/Hr/SignRepairController.php +++ b/app/Admin/Controllers/Hr/SignRepairController.php @@ -23,6 +23,7 @@ class SignRepairController extends AdminController public function list(): Page { + $user = Admin::user(); $crud = $this->baseCRUD() ->tableLayout('fixed') ->headerToolbar([