pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin role

main
panliang 2024-04-24 21:34:29 +08:00
parent d023d07127
commit 8fac9502c5
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/AgreementController.php
View File

@ -108,7 +108,7 @@ class AgreementController extends AdminController
['label' => __('agreement.images'), 'content' => amisMake()->Images()->name('images')->enlargeAble(), 'span' => 3], ['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.check_status'), 'content' => amisMake()->Mapping()->name('workflow.check_status')->map(CheckStatus::options())],
['label' => __('workflow_log.checked_at'), 'content' => '${workflow.checked_at}'], ['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([ return $this->baseDetail()->id($detailId)->title('')->onEvent([

2
app/Admin/Controllers/SettingController.php
View File

@ -40,7 +40,7 @@ class SettingController extends AdminController
amis()->SwitchControl('oss_config.use_ssl', '开启SSL')->value(false)->visibleOn('${upload_disk == "oss"}'), amis()->SwitchControl('oss_config.use_ssl', '开启SSL')->value(false)->visibleOn('${upload_disk == "oss"}'),
]), ]),
Tab::make()->title('打卡设置')->body([ Tab::make()->title('打卡设置')->body([
amisMake()->NumberControl()->name('sign.distance')->label('允许打卡的距离(公里)') amisMake()->NumberControl()->min(0)->name('sign.distance')->label('允许打卡的距离(公里)')
]), ]),
]) ])
); );

30
app/Admin/Controllers/System/AdminRoleController.php
View File

@ -79,7 +79,7 @@ class AdminRoleController extends AdminController
->api(admin_url('system/admin_roles/${id}/permissions')) ->api(admin_url('system/admin_roles/${id}/permissions'))
->mode('normal') ->mode('normal')
->data(['id' => '${id}']) ->data(['id' => '${id}'])
->body([ ->body(
amis()->TreeControl() amis()->TreeControl()
->name('permissions') ->name('permissions')
->label() ->label()
@ -88,15 +88,17 @@ class AdminRoleController extends AdminController
->searchable() ->searchable()
->cascade() ->cascade()
->value('${permission_ids}') ->value('${permission_ids}')
->joinValues(false) ->joinValues(false)
->extractValue() ->extractValue()
->size('full') ->heightAuto()
->className('h-full b-none') ->showIcon(false)
->inputClassName('h-full tree-full') ->initiallyOpen(false)
// ->size('full')
// ->className('h-full b-none')
// ->inputClassName('h-full tree-full')
->labelField('name') ->labelField('name')
->valueField('id'), ->valueField('id'),
]), ),
])->size('lg') ])->size('lg')
); );
} }
@ -117,7 +119,7 @@ class AdminRoleController extends AdminController
->api(admin_url(admin_url('system/admin_roles/${id}/menus'))) ->api(admin_url(admin_url('system/admin_roles/${id}/menus')))
->mode('normal') ->mode('normal')
->data(['id' => '${id}']) ->data(['id' => '${id}'])
->body([ ->body(
amis()->TreeControl() amis()->TreeControl()
->name('menus') ->name('menus')
->label() ->label()
@ -126,15 +128,17 @@ class AdminRoleController extends AdminController
->searchable() ->searchable()
->cascade() ->cascade()
->value('${menu_ids}') ->value('${menu_ids}')
->joinValues(false) ->joinValues(false)
->extractValue() ->extractValue()
->size('full') ->heightAuto()
->className('h-full b-none') ->showIcon(false)
->inputClassName('h-full tree-full') ->initiallyOpen(false)
// ->size('full')
// ->className('h-full b-none')
// ->inputClassName('h-full tree-full')
->labelField('title') ->labelField('title')
->valueField('id'), ->valueField('id')
]), ),
])->size('lg') ])->size('lg')
); );
} }

1
app/Admin/Services/EmployeeService.php
View File

@ -44,7 +44,6 @@ class EmployeeService extends BaseService
// 职位修改 // 职位修改
if (isset($data['jobs'])) { if (isset($data['jobs'])) {
dd($data['jobs']);
$jobs = is_array($data['jobs']) ? $data['jobs'] : explode(',', $data['jobs']); $jobs = is_array($data['jobs']) ? $data['jobs'] : explode(',', $data['jobs']);
$model->jobs()->sync($jobs); $model->jobs()->sync($jobs);
} }

2
app/Admin/routes.php
View File

@ -140,7 +140,7 @@ Route::group([
// 门店统计 // 门店统计
$router->get('store-statistics', [StoreStatisticController::class, 'index'])->name('store_statistics.index'); $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');
}); });
/* /*