diff --git a/app/Admin/Controllers/AgreementController.php b/app/Admin/Controllers/AgreementController.php index e0f3ab7..8876594 100644 --- a/app/Admin/Controllers/AgreementController.php +++ b/app/Admin/Controllers/AgreementController.php @@ -108,7 +108,7 @@ class AgreementController extends AdminController ['label' => __('agreement.images'), 'content' => amisMake()->Images()->name('images')->enlargeAble(), 'span' => 3], ['label' => __('workflow_log.check_status'), 'content' => amisMake()->Mapping()->name('workflow.check_status')->map(CheckStatus::options())], ['label' => __('workflow_log.checked_at'), 'content' => '${workflow.checked_at}'], - ['label' => __('workflow_log.remarks'), 'content' => '${workflow_log.check_remarks}'], + ['label' => __('workflow_log.remarks'), 'content' => '${workflow.check_remarks}'], ]); return $this->baseDetail()->id($detailId)->title('')->onEvent([ diff --git a/app/Admin/Controllers/SettingController.php b/app/Admin/Controllers/SettingController.php index 5fe076f..a3c2f89 100644 --- a/app/Admin/Controllers/SettingController.php +++ b/app/Admin/Controllers/SettingController.php @@ -40,7 +40,7 @@ class SettingController extends AdminController amis()->SwitchControl('oss_config.use_ssl', '开启SSL')->value(false)->visibleOn('${upload_disk == "oss"}'), ]), Tab::make()->title('打卡设置')->body([ - amisMake()->NumberControl()->name('sign.distance')->label('允许打卡的距离(公里)') + amisMake()->NumberControl()->min(0)->name('sign.distance')->label('允许打卡的距离(公里)') ]), ]) ); diff --git a/app/Admin/Controllers/System/AdminRoleController.php b/app/Admin/Controllers/System/AdminRoleController.php index fa012ab..70f5ac6 100644 --- a/app/Admin/Controllers/System/AdminRoleController.php +++ b/app/Admin/Controllers/System/AdminRoleController.php @@ -79,7 +79,7 @@ class AdminRoleController extends AdminController ->api(admin_url('system/admin_roles/${id}/permissions')) ->mode('normal') ->data(['id' => '${id}']) - ->body([ + ->body( amis()->TreeControl() ->name('permissions') ->label() @@ -88,15 +88,17 @@ class AdminRoleController extends AdminController ->searchable() ->cascade() ->value('${permission_ids}') - ->joinValues(false) ->extractValue() - ->size('full') - ->className('h-full b-none') - ->inputClassName('h-full tree-full') + ->heightAuto() + ->showIcon(false) + ->initiallyOpen(false) + // ->size('full') + // ->className('h-full b-none') + // ->inputClassName('h-full tree-full') ->labelField('name') ->valueField('id'), - ]), + ), ])->size('lg') ); } @@ -117,7 +119,7 @@ class AdminRoleController extends AdminController ->api(admin_url(admin_url('system/admin_roles/${id}/menus'))) ->mode('normal') ->data(['id' => '${id}']) - ->body([ + ->body( amis()->TreeControl() ->name('menus') ->label() @@ -126,15 +128,17 @@ class AdminRoleController extends AdminController ->searchable() ->cascade() ->value('${menu_ids}') - ->joinValues(false) ->extractValue() - ->size('full') - ->className('h-full b-none') - ->inputClassName('h-full tree-full') + ->heightAuto() + ->showIcon(false) + ->initiallyOpen(false) + // ->size('full') + // ->className('h-full b-none') + // ->inputClassName('h-full tree-full') ->labelField('title') - ->valueField('id'), - ]), + ->valueField('id') + ), ])->size('lg') ); } diff --git a/app/Admin/Services/EmployeeService.php b/app/Admin/Services/EmployeeService.php index 3b1083b..8ccad56 100644 --- a/app/Admin/Services/EmployeeService.php +++ b/app/Admin/Services/EmployeeService.php @@ -44,7 +44,6 @@ class EmployeeService extends BaseService // 职位修改 if (isset($data['jobs'])) { - dd($data['jobs']); $jobs = is_array($data['jobs']) ? $data['jobs'] : explode(',', $data['jobs']); $model->jobs()->sync($jobs); } diff --git a/app/Admin/routes.php b/app/Admin/routes.php index eec4c0e..537be09 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -140,7 +140,7 @@ Route::group([ // 门店统计 $router->get('store-statistics', [StoreStatisticController::class, 'index'])->name('store_statistics.index'); // 店长提成 - $router->resource('store-master-commissions', StoreMasterCommissionController::class); + $router->resource('store-master-commissions', StoreMasterCommissionController::class)->names('store_master_commissions'); }); /*