generated from liutk/owl-admin-base
employee
parent
8fa087bf46
commit
9934878995
|
|
@ -33,7 +33,7 @@ class EmployeeController extends AdminController
|
||||||
->valueField('id')
|
->valueField('id')
|
||||||
->columnRatio(3)
|
->columnRatio(3)
|
||||||
->clearable(),
|
->clearable(),
|
||||||
amisMake()->TextControl()->name('employee_search')->label(__('store.employees'))->placeholder('姓名/电话')->columnRatio(3)->clearable(),
|
amisMake()->TextControl()->name('search')->label(__('store.employees'))->placeholder('姓名/电话')->columnRatio(3)->clearable(),
|
||||||
]),
|
]),
|
||||||
]))
|
]))
|
||||||
->filterDefaultVisible()
|
->filterDefaultVisible()
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,10 @@ class EmployeeController extends Controller
|
||||||
$filter = $request->all();
|
$filter = $request->all();
|
||||||
$query = Employee::with(['jobs', 'store', 'adminUser'])->filter($filter)->enable();
|
$query = Employee::with(['jobs', 'store', 'adminUser'])->filter($filter)->enable();
|
||||||
|
|
||||||
if (!in_array(UserRole::Admin->value, $role)) {
|
if (!in_array(UserRole::Admin, $role)) {
|
||||||
$query->whereIn('store_id', [$user->store_id]);
|
$query->whereIn('store_id', [$user->store_id]);
|
||||||
}
|
}
|
||||||
$list = $query->paginate($request->input('per_page'));
|
$list = $query->orderBy('id', 'desc')->paginate($request->input('per_page'));
|
||||||
|
|
||||||
return EmployeeResource::collection($list);
|
return EmployeeResource::collection($list);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue