merge

2024-03-26 13:06:39 +08:00 · 2024-03-26 13:06:39 +08:00 · 98b13587c7
parent 00ca851db4 495824eb8d
commit 98b13587c7
5 changed files with 94 additions and 12 deletions
--- a/app/Admin/Controllers/Hr/EmployeeController.php
+++ b/app/Admin/Controllers/Hr/EmployeeController.php
@ -19,9 +19,10 @@ class EmployeeController extends AdminController
        $crud = $this->baseCRUD()
            ->tableLayout('fixed')
            ->headerToolbar([
-                $this->createButton(true),
+                $this->createButton(true)->visible(Admin::user()->can('admin.hr.employees.create')),
                ...$this->baseHeaderToolBar(),
            ])
+            ->bulkActions([])
            ->filter($this->baseFilter()->body([
                amis()->GroupControl()->mode('horizontal')->body([
                    amisMake()->TextControl()->name('name')->label(__('employee.name'))->columnRatio(3)->clearable(),
@ -39,9 +40,22 @@ class EmployeeController extends AdminController
                    ->falseValue(EmployeeStatus::Offline),
                amisMake()->TableColumn()->name('created_at')->label(__('employee.created_at')),
                $this->rowActions([
+<<<<<<< HEAD
                    $this->rowShowButton(),
                    $this->rowEditButton(true),
                    $this->rowDeleteButton(),
+=======
+                    $this->rowShowButton()->visible(Admin::user()->can('admin.hr.employees.view')),
+                    $this->rowEditButton(true)->visible(Admin::user()->can('admin.hr.employees.update')),
+                    $this->rowDeleteButton()->visible(Admin::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')),
+>>>>>>> 495824eb8da84ef9a6cb665de688ba3e07329cee
                ]),
            ]);

--- a/app/Admin/Controllers/Store/StoreController.php
+++ b/app/Admin/Controllers/Store/StoreController.php
@ -23,9 +23,10 @@ class StoreController extends AdminController
        $crud = $this->baseCRUD()
            ->tableLayout('fixed')
            ->headerToolbar([
-                $this->createButton(),
+                $this->createButton()->visible(Admin::user()->can('admin.store.stores.create')),
                ...$this->baseHeaderToolBar(),
            ])
+            ->bulkActions([])
            ->filter($this->baseFilter()->body([
                amis()->GroupControl()->mode('horizontal')->body([
                    amisMake()->TextControl()->name('title')->label(__('store.title'))->columnRatio(3)->clearable(),
@ -64,9 +65,9 @@ class StoreController extends AdminController
                amisMake()->TableColumn()->name('business_status')->label(__('store.business_status'))->type('switch')->trueValue(BusinessStatus::Open)->falseValue(BusinessStatus::Close),
                amisMake()->TableColumn()->name('created_at')->label(__('store.created_at')),
                $this->rowActions([
-                    $this->rowShowButton(),
-                    $this->rowEditButton(),
-                    $this->rowDeleteButton(),
+                    $this->rowShowButton()->visible(Admin::user()->can('admin.store.stores.view')),
+                    $this->rowEditButton()->visible(Admin::user()->can('admin.store.stores.update')),
+                    $this->rowDeleteButton()->visible(Admin::user()->can('admin.store.stores.delete')),
                ]),
            ]);

--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@ -1,5 +1,7 @@
 <?php

+use App\Admin\Controllers\Hr\EmployeeController;
+use App\Admin\Controllers\Store\StoreController;
 use App\Admin\Controllers\System\AdminMenuController;
 use App\Admin\Controllers\System\AdminPermissionController;
 use App\Admin\Controllers\System\AdminRoleController;
@ -23,18 +25,37 @@ Route::group([
    | 门店管理
    |--------------------------------------------------------------------------
    */
-    $router->get('store/stores/{id}/employees', [\App\Admin\Controllers\Store\StoreController::class, 'employees']);
-    $router->get('store/stores/employee_options', [\App\Admin\Controllers\Store\StoreController::class, 'employeeOptions']);
-    $router->post('store/stores/{id}/employees', [\App\Admin\Controllers\Store\StoreController::class, 'employeeAdd']);
-    $router->delete('store/stores/{id}/employees', [\App\Admin\Controllers\Store\StoreController::class, 'employeeDestroy']);
-    $router->resource('store/stores', \App\Admin\Controllers\Store\StoreController::class);
+    $router->group([
+        'prefix' => 'store',
+        'as' => 'store.',
+    ], function (Router $router) {
+        // 店员列表
+        $router->get('stores/{id}/employees', [StoreController::class, 'employees']);
+        // 添加店员时, 可选的员工列表
+        $router->get('stores/employee_options', [StoreController::class, 'employeeOptions']);
+        // 添加店员
+        $router->post('stores/{id}/employees', [StoreController::class, 'employeeAdd']);
+        // 删除店员
+        $router->delete('stores/{id}/employees', [StoreController::class, 'employeeDestroy']);
+        // 门店管理
+        $router->resource('stores', StoreController::class);
+    });
+

    /*
    |--------------------------------------------------------------------------
    | 人事管理
    |--------------------------------------------------------------------------
    */
-    $router->resource('hr/employees', \App\Admin\Controllers\Hr\EmployeeController::class);
+    $router->group([
+        'prefix' => 'hr',
+        'as' => 'hr.',
+    ], function (Router $router) {
+        // 人事管理
+        $router->resource('employees', EmployeeController::class);
+        $router->post('employees/{id}/leave', [EmployeeController::class, 'leave'])->name('employees.leave');
+    });
+

    /*
    |--------------------------------------------------------------------------
--- a/database/seeders/AdminPermissionSeeder.php
+++ b/database/seeders/AdminPermissionSeeder.php
@ -28,6 +28,47 @@ class AdminPermissionSeeder extends Seeder
                'children' => [],
            ],

+            /*
+            |--------------------------------------------------------------------------
+            | 门店管理
+            |--------------------------------------------------------------------------
+            */
+            'store' => [
+                'name' => '门店管理',
+                'icon' => 'material-symbols:store-rounded',
+                'uri' => '/store',
+                'children' => [
+                    'stores' => [
+                        'name' => '门店管理',
+                        'icon' => 'material-symbols:store-rounded',
+                        'uri' => '/store/stores',
+                        'resource' => true,
+                    ],
+                ],
+            ],
+
+            /*
+            |--------------------------------------------------------------------------
+            | 人事管理
+            |--------------------------------------------------------------------------
+            */
+            'hr' => [
+                'name' => '人事管理',
+                'icon' => 'flowbite:user-settings-solid',
+                'uri' => '/hr',
+                'children' => [
+                    'employees' => [
+                        'name' => '员工管理',
+                        'icon' => 'mdi:user-tie',
+                        'uri' => '/hr/employees',
+                        'resource' => true,
+                        'children' => [
+                            'leave' => '离职',
+                        ],
+                    ],
+                ],
+            ],
+
            /*
            |--------------------------------------------------------------------------
            | 系统管理
@ -36,7 +77,7 @@ class AdminPermissionSeeder extends Seeder
            'system' => [
                'name' => '系统管理',
                'icon' => 'material-symbols:settings-outline',
-                'uri' => '',
+                'uri' => '/system',
                'children' => [
                    'admin_users' => [
                        'name' => '账号管理',
--- a/database/seeders/KeywordSeeder.php
+++ b/database/seeders/KeywordSeeder.php
@ -67,6 +67,11 @@ class KeywordSeeder extends Seeder
                'name' => '门店等级',
                'children' => ['AAA', 'AA', 'A', 'B', 'C', '无'],
            ],
+            [
+                'key' => 'lottery_type',
+                'name' => '彩种类型',
+                'children' => ['大乐透', '七星彩', '排列三', '排列五', '合买', '即开'],
+            ],
        ];

        $this->insertKeywors($keywords);