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

admin employee.jobs

main
panliang 2024-04-22 10:47:32 +08:00
parent ea9aeebeb3
commit 01df00a29f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Admin/Controllers/Hr/EmployeeController.php
View File

@ -73,11 +73,11 @@ class EmployeeController extends AdminController
amisMake()->TextControl()->name('name')->label(__('employee.name'))->required(), amisMake()->TextControl()->name('name')->label(__('employee.name'))->required(),
amisMake()->TextControl()->name('phone')->label(__('employee.phone'))->required(), amisMake()->TextControl()->name('phone')->label(__('employee.phone'))->required(),
// amisMake()->TagControl()->name('jobs')->label(__('employee.jobs')) amisMake()->TagControl()->name('jobs')->label(__('employee.jobs'))
// ->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY) ->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY)
// ->labelField('name') ->labelField('name')
// ->valueField('key') ->valueField('key')
// ->joinValues(), ->joinValues(),
amisMake()->DateControl()->name('join_at')->label(__('employee.join_at'))->format('YYYY-MM-DD'), amisMake()->DateControl()->name('join_at')->label(__('employee.join_at'))->format('YYYY-MM-DD'),
amisMake()->TextControl()->name('remarks')->label(__('employee.remarks')), amisMake()->TextControl()->name('remarks')->label(__('employee.remarks')),
amisMake()->ImageControl()->name('prize_images')->label(__('employee.prize_images')) amisMake()->ImageControl()->name('prize_images')->label(__('employee.prize_images'))

2
app/Admin/Controllers/Store/StoreController.php
View File

@ -126,6 +126,6 @@ class StoreController extends AdminController
public function shareList() public function shareList()
{ {
return $this->service->listQuery()->get(['id', 'title']); return $this->service->listQuery()->where('business_status', BusinessStatus::Open)->get(['id', 'title']);
} }
} }

2
app/Console/Commands/EmployeeSign.php
View File

@ -20,7 +20,7 @@ class EmployeeSign extends Command
* *
* @var string * @var string
*/ */
protected $description = '员工签到情况'; protected $description = '员工签到情况统计';
/** /**
* Execute the console command. * Execute the console command.

4
app/Http/Controllers/Api/Auth/UserController.php
View File

@ -8,7 +8,7 @@ use App\Models\{Employee, Store, AdminUser};
use Illuminate\Http\{Request, Response}; use Illuminate\Http\{Request, Response};
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use App\Enums\UserRole; use App\Enums\{UserRole, BusinessStatus};
use App\Http\Resources\KeywordResource; use App\Http\Resources\KeywordResource;
use App\Admin\Services\EmployeeService; use App\Admin\Services\EmployeeService;
use App\Http\Resources\StoreResource; use App\Http\Resources\StoreResource;
@ -61,7 +61,7 @@ class UserController extends Controller
$user = $this->guard()->user(); $user = $this->guard()->user();
$role = $user->userRole(); $role = $user->userRole();
$list = []; $list = [];
$query = Store::filter($request->all()); $query = Store::filter($request->all())->where('business_status', BusinessStatus::Open);
if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) { if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
$list = [Store::findOrFail($user->store_id)]; $list = [Store::findOrFail($user->store_id)];
} else if (in_array(UserRole::Admin, $role)) { } else if (in_array(UserRole::Admin, $role)) {

2
database/seeders/KeywordSeeder.php
View File

@ -34,7 +34,7 @@ class KeywordSeeder extends Seeder
[ [
'key' => 'job', 'key' => 'job',
'name' => '职位', 'name' => '职位',
'children' => ['普通员工', '店长', '区域经理'], 'children' => ['普通员工', '店长'],
], ],
[ [
'key' => 'store_category', 'key' => 'store_category',