Compare commits

..

No commits in common. "d76f8e57f36bdfe68254f9ee7f43bdfaa49e98a3" and "8be1888b00e20aff7c982845ac82816ce5d11c57" have entirely different histories.

3 changed files with 3 additions and 12 deletions

View File

@ -77,8 +77,7 @@ class EmployeeController extends AdminController
->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY)
->labelField('name')
->valueField('key')
->extractValue(true)
->joinValues(false),
->joinValues(),
amisMake()->DateControl()->name('join_at')->label(__('employee.join_at'))->format('YYYY-MM-DD'),
amisMake()->TextControl()->name('remarks')->label(__('employee.remarks')),
amisMake()->ImageControl()->name('prize_images')->label(__('employee.prize_images'))

View File

@ -70,15 +70,7 @@ class EmployeeService extends BaseService
// 职位修改
if (isset($data['jobs'])) {
if (is_array($data['jobs'])) {
if (is_array($data['jobs'][0])) {
$jobs = array_column($data['jobs'], 'key');
} else {
$jobs = $data['jobs'];
}
} else {
$jobs = explode(',', $data['jobs']);
}
$jobs = is_array($data['jobs']) ? $data['jobs'] : explode(',', $data['jobs']);
$model->jobs()->sync($jobs);
}

View File

@ -67,7 +67,7 @@ class AdminPermissionSeeder extends Seeder
'levels' => [
'name' => '门店等级',
'icon' => 'carbon:skill-level',
'uri' => '/store/levels?parent_key=store_level',
'uri' => '/store/levels?parent_key=store_levels',
'resource' => true,
'order' => 4,