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

编码格式化

main
Jing Li 2024-04-07 13:30:37 +08:00
parent 6a27c971e6
commit c68fe05a28
66 changed files with 285 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Admin/Controllers/AdminController.php
View File

@ -35,7 +35,7 @@ abstract class AdminController extends Controller
}
if (! $result) {
admin_abort($this->service->getError() ?: __('admin.save') . __('admin.failed'));
admin_abort($this->service->getError() ?: __('admin.save').__('admin.failed'));
}
DB::commit();
@ -44,7 +44,7 @@ abstract class AdminController extends Controller
throw $this->prepareException($th);
}
return $this->response()->successMessage(__('admin.save') . __('admin.successfully'));
return $this->response()->successMessage(__('admin.save').__('admin.successfully'));
}
/**
@ -64,7 +64,7 @@ abstract class AdminController extends Controller
$result = $this->service->update($this->getPrimaryValue($request), $input);
if (! $result) {
admin_abort($this->service->getError() ?: __('admin.save') . __('admin.failed'));
admin_abort($this->service->getError() ?: __('admin.save').__('admin.failed'));
}
DB::commit();
@ -73,7 +73,7 @@ abstract class AdminController extends Controller
throw $this->prepareException($th);
}
return $this->response()->successMessage(__('admin.save') . __('admin.successfully'));
return $this->response()->successMessage(__('admin.save').__('admin.successfully'));
}
/**
@ -92,7 +92,7 @@ abstract class AdminController extends Controller
throw $this->prepareException($th);
}
return $this->response()->successMessage(__('admin.delete') . __('admin.successfully'));
return $this->response()->successMessage(__('admin.delete').__('admin.successfully'));
}
public function getQuickEditItemPath(array $fields = ['*'])

6
app/Admin/Controllers/AuthController.php
View File

@ -44,9 +44,9 @@ class AuthController extends AdminAuthController
} else {
if ($user && Hash::check($request->password, $user->password)) {
$module = Admin::currentModule(true);
$prefix = $module ? $module . '.' : '';
$token = $user->createToken($prefix . 'admin')->plainTextToken;
$prefix = $module ? $module.'.' : '';
$token = $user->createToken($prefix.'admin')->plainTextToken;
return $this->response()->success(compact('token'), __('admin.login_successful'));
}

12
app/Admin/Controllers/Finance/CommissionIncomeController.php
View File

@ -59,12 +59,12 @@ class CommissionIncomeController extends AdminController
protected function getCommissionIncomeStatistics(Request $request): array
{
$aggregate = Ledger::select([
DB::raw('SUM(expenditure) as expenditure'),
DB::raw('SUM(expected_commission) as expected_commission'),
DB::raw('SUM(actual_commission) as actual_commission'),
DB::raw('SUM(expected_income) as expected_income'),
DB::raw('SUM(actual_income) as actual_income'),
])
DB::raw('SUM(expenditure) as expenditure'),
DB::raw('SUM(expected_commission) as expected_commission'),
DB::raw('SUM(actual_commission) as actual_commission'),
DB::raw('SUM(expected_income) as expected_income'),
DB::raw('SUM(actual_income) as actual_income'),
])
->filter($request->input(), LedgerFilter::class)
->first();

2
app/Admin/Controllers/Finance/LedgerController.php
View File

@ -36,7 +36,7 @@ class LedgerController extends AdminController
['label' => '类型', 'content' => $item->type?->name ?? '-'],
['label' => '销售', 'content' => $item->sales],
['label' => $item->ledger_item_type_id === 'ledger_item_type_other' ? '支出' : '兑奖', 'content' => $item->expenditure],
])->collapse()->all()
])->collapse()->all(),
])
);
}

9
app/Admin/Controllers/Finance/SalesStatisticController.php
View File

@ -66,10 +66,10 @@ class SalesStatisticController extends AdminController
/** @var \Illuminate\Database\Eloquent\Collection */
$statistics = LedgerItem::select([
'ledger_item_type_id',
DB::raw('SUM(sales) as sales'),
DB::raw('SUM(expenditure) as expenditure'),
])
'ledger_item_type_id',
DB::raw('SUM(sales) as sales'),
DB::raw('SUM(expenditure) as expenditure'),
])
->filter($request->input(), LedgerItemFilter::class)
->whereIn('ledger_item_type_id', $lotteryTypes->pluck('value'))
->groupBy('ledger_item_type_id')
@ -78,6 +78,7 @@ class SalesStatisticController extends AdminController
return $lotteryTypes->map(function ($lotteryType) use ($statistics) {
$statistic = $statistics->get($lotteryType->value);
return [
'name' => $lotteryType->name,
'sales' => trim_zeros($statistic->sales ?? '0.00'),

23
app/Admin/Controllers/Finance/StoreStatisticController.php
View File

@ -55,10 +55,10 @@ class StoreStatisticController extends AdminController
/** @var \Illuminate\Database\Eloquent\Collection */
$statistics = Ledger::select([
'store_id',
DB::raw('SUM(sales) as sales'),
DB::raw('SUM(expenditure) as expenditure'),
])
'store_id',
DB::raw('SUM(sales) as sales'),
DB::raw('SUM(expenditure) as expenditure'),
])
->filter($request->input(), LedgerItemFilter::class)
->groupBy('store_id')
->get()
@ -70,13 +70,14 @@ class StoreStatisticController extends AdminController
];
return $stores->map(function ($store) use ($statistics) {
$statistic = $statistics->get($store->id);
return [
'title' => $store->title,
'sales' => trim_zeros($statistic->sales ?? '0'),
'expenditure' => trim_zeros($statistic->expenditure ?? '0'),
];
})
$statistic = $statistics->get($store->id);
return [
'title' => $store->title,
'sales' => trim_zeros($statistic->sales ?? '0'),
'expenditure' => trim_zeros($statistic->expenditure ?? '0'),
];
})
->sortBy($sortBy)
->values()
->map(fn ($statistic, $key) => array_merge($statistic, ['ranking' => $key + 1]))

12
app/Admin/Controllers/Hr/HolidayController.php
View File

@ -4,12 +4,12 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\HolidayApplyService;
use App\Enums\CheckStatus;
use App\Enums\EmployeeStatus;
use App\Traits\HasCheckActions;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{CheckStatus, EmployeeStatus};
use App\Models\HolidayApply;
use App\Traits\HasCheckActions;
/**
* 请假管理
@ -127,8 +127,8 @@ class HolidayController extends AdminController
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => $serviceId],
]
]
],
],
])->body([
$detail,
amisMake()->Divider(),

12
app/Admin/Controllers/Hr/OfficalBusinessController.php
View File

@ -4,12 +4,12 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\OfficalBusinessService;
use App\Enums\CheckStatus;
use App\Enums\EmployeeStatus;
use App\Traits\HasCheckActions;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{CheckStatus, EmployeeStatus};
use App\Models\OfficalBusiness;
use App\Traits\HasCheckActions;
/**
* 出差报备
@ -114,8 +114,8 @@ class OfficalBusinessController extends AdminController
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => $serviceId],
]
]
],
],
])->body([
$detail,
amisMake()->Divider(),

12
app/Admin/Controllers/Hr/OvertimeController.php
View File

@ -4,12 +4,12 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\OvertimeApplyService;
use App\Enums\CheckStatus;
use App\Enums\EmployeeStatus;
use App\Traits\HasCheckActions;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{CheckStatus, EmployeeStatus};
use App\Models\OvertimeApply;
use App\Traits\HasCheckActions;
/**
* 加班管理
@ -116,8 +116,8 @@ class OvertimeController extends AdminController
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => $serviceId],
]
]
],
],
])->body([
$detail,
amisMake()->Divider(),

12
app/Admin/Controllers/Hr/PromotionController.php
View File

@ -4,12 +4,12 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\EmployeePromotionService;
use App\Enums\EmployeeStatus;
use App\Enums\PromotionStatus;
use App\Traits\HasCheckActions;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{CheckStatus, PromotionStatus, EmployeeStatus};
use App\Models\EmployeePromotion;
use App\Traits\HasCheckActions;
/**
* 升职申请
@ -125,8 +125,8 @@ class PromotionController extends AdminController
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => $serviceId],
]
]
],
],
])->body([
$detail,
amisMake()->Divider(),

2
app/Admin/Controllers/Hr/RestController.php
View File

@ -5,9 +5,9 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\EmployeeRestService;
use App\Enums\EmployeeStatus;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
/**
* 休息管理

12
app/Admin/Controllers/Hr/SignController.php
View File

@ -4,10 +4,12 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\EmployeeSignService;
use App\Enums\SignStatus;
use App\Enums\SignTime;
use App\Enums\SignType;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{SignType, SignStatus, SignTime};
/**
* 考勤打卡
@ -86,12 +88,13 @@ class SignController extends AdminController
amisMake()->TableColumn()->name('position.address')->label(__('employee_sign_log.position')),
])
);
return $this->baseDetail()->title('')->onEvent([
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => 'employee-sign-log-table'],
]
]
],
],
])->body([$detail, amisMake()->Divider()->title(__('employee_sign.log')), $logs]);
}
@ -99,6 +102,7 @@ class SignController extends AdminController
{
$type = SignType::options();
$status = SignStatus::options();
return [
__('employee_sign.date') => data_get($row, 'date'),
__('employee_sign.store_id') => data_get($row, 'store.title'),

1
app/Admin/Controllers/Hr/SignLogController.php
View File

@ -12,6 +12,7 @@ class SignLogController extends AdminController
{
$with = $request->input('with', []);
$list = EmployeeSignLog::with($with)->filter($request->all())->orderBy('time', 'asc')->get();
return $this->response()->success($list);
}
}

23
app/Admin/Controllers/Hr/SignRepairController.php
View File

@ -4,12 +4,13 @@ namespace App\Admin\Controllers\Hr;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\EmployeeSignRepairService;
use App\Enums\CheckStatus;
use App\Enums\EmployeeStatus;
use App\Enums\SignTime;
use App\Traits\HasCheckActions;
use Slowlyo\OwlAdmin\Admin;
use Slowlyo\OwlAdmin\Renderers\Form;
use Slowlyo\OwlAdmin\Renderers\Page;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\{EmployeeStatus, SignTime, CheckStatus};
use App\Models\EmployeeSignRepair;
use App\Traits\HasCheckActions;
/**
* 补卡申请
@ -45,10 +46,10 @@ class SignRepairController extends AdminController
amisMake()->DateRangeControl()->name('date_range')->label(__('employee_sign_repair.date'))
->columnRatio(3)
->clearable(),
amisMake()->SelectControl()->name('check_status')->label(__('employee_sign_repair.check_status'))
->options(CheckStatus::options())
->columnRatio(3)
->clearable()
amisMake()->SelectControl()->name('check_status')->label(__('employee_sign_repair.check_status'))
->options(CheckStatus::options())
->columnRatio(3)
->clearable(),
]),
]))
->columns([
@ -72,7 +73,7 @@ class SignRepairController extends AdminController
->visibleOn('${OR(workflow.check_status == '.CheckStatus::None->value.', workflow.check_status == '.CheckStatus::Cancel->value.', workflow.check_status == '.CheckStatus::Fail->value.')}'),
$this->applyAction(),
$this->cancelAction(),
])
]),
]);
return $this->baseList($crud);
@ -121,8 +122,8 @@ class SignRepairController extends AdminController
'inited' => [
'actions' => [
['actionType' => 'reload', 'componentId' => $serviceId],
]
]
],
],
])->body([
$detail,
amisMake()->Divider(),

1
app/Admin/Controllers/System/AdminUserController.php
View File

@ -48,6 +48,7 @@ class AdminUserController extends AdminController
amis()->SwitchControl()->saveImmediately()->mode('inline')->disabledOn('${id === 1}')
);
}
return $column->type('status')->source([
0 => ['label' => '未锁定', 'icon' => 'fa fa-times-circle', 'color' => '#30bf13'],
1 => ['label' => '已锁定', 'icon' => 'fa fa-check-circle', 'color' => '#f70e47'],

27
app/Admin/Controllers/System/WorkflowController.php
View File

@ -5,8 +5,10 @@ namespace App\Admin\Controllers\System;
use App\Admin\Controllers\AdminController;
use App\Admin\Services\WorkFlowService;
use App\Enums\CheckType;
use App\Models\Employee;
use App\Models\Keyword;
use App\Models\{Employee, WorkflowLog, WorkflowCheck};
use App\Models\WorkflowCheck;
use App\Models\WorkflowLog;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Slowlyo\OwlAdmin\Admin;
@ -109,13 +111,15 @@ class WorkflowController extends AdminController
try {
DB::beginTransaction();
if (!$this->service->apply($model, $employee)) {
if (! $this->service->apply($model, $employee)) {
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
}
@ -126,13 +130,15 @@ class WorkflowController extends AdminController
try {
DB::beginTransaction();
if (!$this->service->cancel($model)) {
if (! $this->service->cancel($model)) {
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
}
@ -141,43 +147,47 @@ class WorkflowController extends AdminController
{
$user = Admin::user();
$employee = Employee::where('admin_user_id', $user->id)->first();
if (!$employee) {
if (! $employee) {
return $this->response()->fail('当前登录账户未关联员工');
}
$log = WorkflowLog::findOrFail($request->input('id'));
try {
DB::beginTransaction();
if (!$this->service->check($employee, $log, true)) {
if (! $this->service->check($employee, $log, true)) {
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
}
public function fail(Request $request)
{
if (!$request->input('remarks')) {
if (! $request->input('remarks')) {
return $this->response()->fail('请填写未通过原因');
}
$user = Admin::user();
$employee = Employee::where('admin_user_id', $user->id)->first();
if (!$employee) {
if (! $employee) {
return $this->response()->fail('当前登录账户未关联员工');
}
$log = WorkflowLog::findOrFail($request->input('id'));
try {
DB::beginTransaction();
if (!$this->service->check($employee, $log, false, ['remarks' => $request->input('remarks')])) {
if (! $this->service->check($employee, $log, false, ['remarks' => $request->input('remarks')])) {
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
}
@ -185,6 +195,7 @@ class WorkflowController extends AdminController
public function logs(Request $request)
{
$list = WorkflowLog::with(['checkUser'])->where('check_id', $request->input('id'))->sort()->get();
return $this->response()->success($list);
}

2
app/Admin/Filters/EmployeeSignLogFilter.php
View File

@ -2,8 +2,8 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
use EloquentFilter\ModelFilter;
class EmployeeSignLogFilter extends ModelFilter
{

2
app/Admin/Filters/EmployeeSignRepairFilter.php
View File

@ -2,8 +2,8 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
use EloquentFilter\ModelFilter;
class EmployeeSignRepairFilter extends ModelFilter
{

1
app/Admin/Filters/HolidayApplyFilter.php
View File

@ -3,7 +3,6 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
class HolidayApplyFilter extends ModelFilter
{

2
app/Admin/Filters/LedgerFilter.php
View File

@ -31,7 +31,7 @@ class LedgerFilter extends ModelFilter
return;
}
$this->related('store', function($query) use ($provinceCode, $cityCode) {
$this->related('store', function ($query) use ($provinceCode, $cityCode) {
$query->when($provinceCode, fn ($query) => $query->where('region->provinceCode', $provinceCode))
->when($cityCode, fn ($query) => $query->where('region->cityCode', $cityCode));
});

2
app/Admin/Filters/LedgerItemFilter.php
View File

@ -24,7 +24,7 @@ class LedgerItemFilter extends ModelFilter
return;
}
$this->related('store', function($query) use ($provinceCode, $cityCode) {
$this->related('store', function ($query) use ($provinceCode, $cityCode) {
$query->when($provinceCode, fn ($query) => $query->where('region->provinceCode', $provinceCode))
->when($cityCode, fn ($query) => $query->where('region->cityCode', $cityCode));
});

2
app/Admin/Filters/OfficalBusinessFilter.php
View File

@ -2,8 +2,8 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
use EloquentFilter\ModelFilter;
class OfficalBusinessFilter extends ModelFilter
{

2
app/Admin/Filters/OvertimeApplyFilter.php
View File

@ -2,8 +2,8 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
use EloquentFilter\ModelFilter;
class OvertimeApplyFilter extends ModelFilter
{

1
app/Admin/Filters/WorkflowCheckFilter.php
View File

@ -3,7 +3,6 @@
namespace App\Admin\Filters;
use EloquentFilter\ModelFilter;
use Carbon\Carbon;
class WorkflowCheckFilter extends ModelFilter
{

2
app/Admin/Middleware/Authenticate.php
View File

@ -3,8 +3,8 @@
namespace App\Admin\Middleware;
use Closure;
use Slowlyo\OwlAdmin\Admin;
use Illuminate\Http\Response;
use Slowlyo\OwlAdmin\Admin;
class Authenticate
{

23
app/Admin/Services/EmployeePromotionService.php
View File

@ -3,10 +3,12 @@
namespace App\Admin\Services;
use App\Admin\Filters\EmployeePromotionFilter;
use App\Models\{EmployeePromotion, Employee};
use Illuminate\Support\Facades\{Validator, DB};
use App\Admin\WorkflowService;
use App\Enums\PromotionStatus;
use App\Models\Employee;
use App\Models\EmployeePromotion;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
class EmployeePromotionService extends BaseService
{
@ -22,14 +24,15 @@ class EmployeePromotionService extends BaseService
if (isset($data['employee_id'])) {
$data['store_id'] = Employee::where('id', $data['employee_id'])->value('store_id');
}
return $data;
}
/**
* 申请人完事资料
*
* @param EmployeePromotion $model
* @param array $data
*
* @param EmployeePromotion $model
* @param array $data
* @return bool
*/
public function apply($model, $data = [])
@ -55,9 +58,9 @@ class EmployeePromotionService extends BaseService
/**
* 邀请人填写推荐理由
*
* @param EmployeePromotion $model
* @param array $data
*
* @param EmployeePromotion $model
* @param array $data
* @return bool
*/
public function invitor($model, $data = [])
@ -73,7 +76,7 @@ class EmployeePromotionService extends BaseService
DB::beginTransaction();
$attributes = array_merge($model->employee_data, $data);
$model->update(['employee_data' => $data, 'promotion_status' => PromotionStatus::Processing]);
// 发起审核申请
$service = WorkflowService::make();
if ($service->apply($model->workflow, $model->employee) !== true) {
@ -82,6 +85,7 @@ class EmployeePromotionService extends BaseService
DB::commit();
} catch (\Exception $e) {
DB::rollBack();
return $this->setError($e->getMessage());
}
@ -101,6 +105,7 @@ class EmployeePromotionService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}

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

@ -72,7 +72,7 @@ class EmployeeService extends BaseService
public function resloveData($data, $model = null)
{
$adminUserService = AdminUserService::make();
if (!$model) {
if (! $model) {
// 添加管理员信息
if (! $adminUserService->store(Arr::only($data, ['username', 'password', 'confirm_password', 'name']))) {
$this->setError($adminUserService->getError());

27
app/Admin/Services/EmployeeSignRepairService.php
View File

@ -3,12 +3,11 @@
namespace App\Admin\Services;
use App\Admin\Filters\EmployeeSignRepairFilter;
use App\Models\{EmployeeSignRepair, WorkflowCheck};
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use App\Models\Employee;
use App\Enums\CheckStatus;
use App\Models\EmployeeSignRepair;
use App\Models\WorkflowCheck;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
class EmployeeSignRepairService extends BaseService
{
@ -37,9 +36,10 @@ class EmployeeSignRepairService extends BaseService
public function resloveData($data, $model = null)
{
// 获取员工所在的门店
if (!isset($data['store_id']) && isset($data['employee_id'])) {
if (! isset($data['store_id']) && isset($data['employee_id'])) {
$data['store_id'] = Employee::where('id', $data['employee_id'])->value('store_id');
}
return $data;
}
@ -64,20 +64,21 @@ class EmployeeSignRepairService extends BaseService
'reason' => ['required'],
];
$updateRules = [
'date' => [$unique->ignore($model?->id)]
'date' => [$unique->ignore($model?->id)],
];
$message = [
'date.required' => __('employee_sign_repair.date') . '必填',
'store_id.required' => __('employee_sign_repair.store_id') . '必填',
'employee_id.required' => __('employee_sign_repair.employee_id') . '必填',
'reason.required' => __('employee_sign_repair.reason') . '必填',
'repair_type.required' => __('employee_sign_repair.repair_type') . '必填',
'date.unique' => __('employee_sign_repair.date') . ' 已经申请过了'
'date.required' => __('employee_sign_repair.date').'必填',
'store_id.required' => __('employee_sign_repair.store_id').'必填',
'employee_id.required' => __('employee_sign_repair.employee_id').'必填',
'reason.required' => __('employee_sign_repair.reason').'必填',
'repair_type.required' => __('employee_sign_repair.repair_type').'必填',
'date.unique' => __('employee_sign_repair.date').' 已经申请过了',
];
$validator = Validator::make($data, $model ? $updateRules : $createRules, $message);
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}

16
app/Admin/Services/EmployeeSignService.php
View File

@ -3,13 +3,13 @@
namespace App\Admin\Services;
use App\Admin\Filters\EmployeeSignFilter;
use App\Models\EmployeeSign;
use App\Models\EmployeeSignLog;
use App\Models\EmployeeRest;
use App\Models\Employee;
use App\Enums\SignType;
use App\Enums\SignStatus;
use App\Enums\SignTime;
use App\Enums\SignType;
use App\Models\Employee;
use App\Models\EmployeeRest;
use App\Models\EmployeeSign;
use App\Models\EmployeeSignLog;
class EmployeeSignService extends BaseService
{
@ -43,7 +43,7 @@ class EmployeeSignService extends BaseService
$firstTime = null;
if ($item = $logs->where('sign_time', SignTime::Morning)->sortBy('time')->first()) {
$firstTime = $item->time;
$status ++;
$status++;
if ($item->sign_type == SignType::Outside) {
$remarks = $item->remarks;
}
@ -52,7 +52,7 @@ class EmployeeSignService extends BaseService
$lastTime = null;
if ($item = $logs->where('sign_time', SignTime::Afternoon)->sortByDesc('time')->first()) {
$lastTime = $item->time;
$status ++;
$status++;
if ($item->sign_type == SignType::Outside) {
$remarks = $item->remarks;
}
@ -68,7 +68,7 @@ class EmployeeSignService extends BaseService
'sign_type' => $type,
'first_time' => $firstTime,
'last_time' => $lastTime,
'sign_status' => match($status) {
'sign_status' => match ($status) {
0 => SignStatus::Absent,
1 => SignStatus::Lose,
2 => SignStatus::Normal,

15
app/Admin/Services/HolidayApplyService.php
View File

@ -3,11 +3,10 @@
namespace App\Admin\Services;
use App\Admin\Filters\HolidayApplyFilter;
use App\Models\{HolidayApply, Employee};
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use App\Models\Employee;
use App\Models\HolidayApply;
use Carbon\Carbon;
use Illuminate\Support\Facades\Validator;
class HolidayApplyService extends BaseService
{
@ -20,15 +19,16 @@ class HolidayApplyService extends BaseService
public function resloveData($data, $model = null)
{
// 获取员工所在的门店
if (!isset($data['store_id']) && isset($data['employee_id'])) {
if (! isset($data['store_id']) && isset($data['employee_id'])) {
$data['store_id'] = Employee::where('id', $data['employee_id'])->value('store_id');
}
// 处理日期
if (isset($data['date_range']) && !isset($data['start_at']) && !isset($data['end_at'])) {
if (isset($data['date_range']) && ! isset($data['start_at']) && ! isset($data['end_at'])) {
$dates = explode(',', $data['date_range']);
$data['start_at'] = Carbon::createFromFormat('Y-m-d', data_get($dates, 0))->startOfDay();
$data['end_at'] = Carbon::createFromFormat('Y-m-d', data_get($dates, 1))->endOfDay();
}
return $data;
}
@ -48,6 +48,7 @@ class HolidayApplyService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}
}

13
app/Admin/Services/OfficalBusinessService.php
View File

@ -3,11 +3,10 @@
namespace App\Admin\Services;
use App\Admin\Filters\OfficalBusinessFilter;
use App\Models\{OfficalBusiness, Employee};
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use App\Models\Employee;
use App\Models\OfficalBusiness;
use Carbon\Carbon;
use Illuminate\Support\Facades\Validator;
class OfficalBusinessService extends BaseService
{
@ -20,7 +19,7 @@ class OfficalBusinessService extends BaseService
public function resloveData($data, $model = null)
{
// 获取员工所在的门店
if (!isset($data['store_id']) && isset($data['employee_id'])) {
if (! isset($data['store_id']) && isset($data['employee_id'])) {
$data['store_id'] = Employee::where('id', $data['employee_id'])->value('store_id');
}
if (isset($data['date_range'])) {
@ -30,6 +29,7 @@ class OfficalBusinessService extends BaseService
$data['start_at'] = $start;
$data['end_at'] = $end;
}
return $data;
}
@ -48,6 +48,7 @@ class OfficalBusinessService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}
}

13
app/Admin/Services/OvertimeApplyService.php
View File

@ -3,11 +3,10 @@
namespace App\Admin\Services;
use App\Admin\Filters\OvertimeApplyFilter;
use App\Models\{OvertimeApply, Employee};
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use App\Models\Employee;
use App\Models\OvertimeApply;
use Carbon\Carbon;
use Illuminate\Support\Facades\Validator;
class OvertimeApplyService extends BaseService
{
@ -20,7 +19,7 @@ class OvertimeApplyService extends BaseService
public function resloveData($data, $model = null)
{
// 获取员工所在的门店
if (!isset($data['store_id']) && isset($data['employee_id'])) {
if (! isset($data['store_id']) && isset($data['employee_id'])) {
$data['store_id'] = Employee::where('id', $data['employee_id'])->value('store_id');
}
if (isset($data['datetime_range'])) {
@ -32,6 +31,7 @@ class OvertimeApplyService extends BaseService
$data['date'] = $start->format('Y-m-d');
$data['hours'] = $start->diffInHours($end);
}
return $data;
}
@ -49,6 +49,7 @@ class OvertimeApplyService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}
}

10
app/Admin/Services/StoreEmployeeService.php
View File

@ -5,7 +5,6 @@ namespace App\Admin\Services;
use App\Admin\Filters\EmployeeFilter;
use App\Models\Employee;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
class StoreEmployeeService extends BaseService
{
@ -44,15 +43,18 @@ class StoreEmployeeService extends BaseService
$employees = Employee::whereIn('id', $data['employee_id'])->get();
foreach ($employees as $employee) {
if ($employee->store_id > 0 && $employee->store_id != $storeId) {
$this->setError($employee->name . ' 已经有门店了');
$this->setError($employee->name.' 已经有门店了');
return false;
}
if ($employee->master_store_id > 0) {
$this->setError($employee->name . ' 已经是店长了');
$this->setError($employee->name.' 已经是店长了');
return false;
}
}
Employee::whereIn('id', $data['employee_id'])->update(['store_id' => $storeId]);
return true;
}
@ -60,6 +62,7 @@ class StoreEmployeeService extends BaseService
{
$id = explode(',', $ids);
Employee::whereIn('id', $id)->update(['store_id' => 0]);
return true;
}
@ -75,6 +78,7 @@ class StoreEmployeeService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}

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

@ -5,7 +5,6 @@ namespace App\Admin\Services;
use App\Admin\Filters\StoreFilter;
use App\Models\Employee;
use App\Models\Store;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;

66
app/Admin/Services/WorkFlowService.php
View File

@ -2,11 +2,17 @@
namespace App\Admin\Services;
use App\Enums\{CheckType, CheckStatus};
use App\Models\{Employee, Store, Keyword, Workflow, WorkflowCheck, WorkflowLog};
use App\Contracts\Checkable;
use App\Enums\CheckStatus;
use App\Enums\CheckType;
use App\Models\Employee;
use App\Models\Keyword;
use App\Models\Store;
use App\Models\Workflow;
use App\Models\WorkflowCheck;
use App\Models\WorkflowLog;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use App\Contracts\Checkable;
class WorkFlowService extends BaseService
{
@ -21,10 +27,9 @@ class WorkFlowService extends BaseService
* 1. 待审核 Model 实现 Checkable
* 2. 生成全部的审核流程
*
* @param WorkflowCheck $check 待审核记录
* @param Employee $user 申请人
*
* @return boolean true: 成功, false: 失败, $this->getError(): 错误消息
* @param WorkflowCheck $check 待审核记录
* @param Employee $user 申请人
* @return bool true: 成功, false: 失败, $this->getError(): 错误消息
*/
public function apply(WorkflowCheck $check, Employee $user)
{
@ -37,8 +42,9 @@ class WorkFlowService extends BaseService
$workflow = Workflow::where('key', $check->key)->first();
// 没有配置审核流程, 直接通过
if (!$workflow || !$workflow->config) {
if (! $workflow || ! $workflow->config) {
$this->success();
return true;
}
$jobs = Keyword::where('parent_key', 'job')->get();
@ -49,28 +55,28 @@ class WorkFlowService extends BaseService
'check_status' => CheckStatus::Processing,
'employee_id' => $user->id,
]);
foreach($config as $item) {
foreach ($config as $item) {
$checkValue = '';
$checkName = '';
// 职位审核
if ($item['type'] == CheckType::Job->value) {
// 没有门店, 则跳过
if (!$user->store_id) {
if (! $user->store_id) {
continue;
}
// 所属门店的职位审核
$store = Store::findOrFail($user->store_id);
$job = $jobs->firstWhere('key', $item['value']);
$checkValue = $store->id . '-' . $job->key;
$checkName = $store->title . '-' . $job->name;
$checkValue = $store->id.'-'.$job->key;
$checkName = $store->title.'-'.$job->name;
}
// 指定用户审核
else if ($item['type'] == CheckType::User->value) {
elseif ($item['type'] == CheckType::User->value) {
$checkUser = Employee::findOrFail($item['value']);
$checkValue = $checkUser->id;
$checkName = $checkUser->name;
} else {
return $this->setError('未知的审核类型: ' . $item['type']);
return $this->setError('未知的审核类型: '.$item['type']);
break;
}
$check->logs()->create([
@ -78,11 +84,12 @@ class WorkFlowService extends BaseService
'check_type' => $item['type'],
'check_value' => $checkValue,
'check_name' => $checkName,
'sort' => $item['sort']
'sort' => $item['sort'],
]);
}
// 开启第一个审核流程
$this->next($check);
return true;
}
@ -91,8 +98,9 @@ class WorkFlowService extends BaseService
$check->update([
'check_status' => CheckStatus::Success,
'checked_at' => data_get($options, 'checked_at', now()),
'check_remarks' => data_get($options, 'remarks')
'check_remarks' => data_get($options, 'remarks'),
]);
return true;
}
@ -103,6 +111,7 @@ class WorkFlowService extends BaseService
'check_remarks' => data_get($options, 'remarks'),
'checked_at' => data_get($options, 'checked_at', now()),
]);
return true;
}
@ -110,7 +119,6 @@ class WorkFlowService extends BaseService
* 取消审核
* 1. 删除未审核的流程
* 2. 更新申请记录的状态
*
*/
public function cancel(WorkflowCheck $check)
{
@ -125,18 +133,18 @@ class WorkFlowService extends BaseService
/**
* 审核单个流程
*
* @param Employee $user 审核人
* @param WorkflowLog $log 审核流水记录
* @param boolean $status 通过/不通过
* @param array $options {remarks: 不通过原因, time: 审核时间(默认当前时间)}
* @return boolean
* @param Employee $user 审核人
* @param WorkflowLog $log 审核流水记录
* @param bool $status 通过/不通过
* @param array $options {remarks: 不通过原因, time: 审核时间(默认当前时间)}
* @return bool
*/
public function check(Employee $user, WorkflowLog $log, $status, $options = [])
{
if ($log->check_status != CheckStatus::Processing) {
return $this->setError('不可操作, 等待前面的审核完成');
}
if (!$this->authCheck($user, $log)) {
if (! $this->authCheck($user, $log)) {
return $this->setError('没有权限');
}
$attributes = ['check_status' => $status ? CheckStatus::Success : CheckStatus::Fail];
@ -156,8 +164,7 @@ class WorkFlowService extends BaseService
/**
* 开启下一个审核流程
*
* @param WorkflowCheck $check
* @return boolean
* @return bool
*/
public function next(WorkflowCheck $check)
{
@ -186,15 +193,16 @@ class WorkFlowService extends BaseService
// }
if ($log->check_type == CheckType::User && $log->check_value == $user->id) {
return true;
} else if ($log->check_type == CheckType::Job) {
} elseif ($log->check_type == CheckType::Job) {
$jobs = $user->jobs;
foreach($jobs as $job) {
if ($log->check_value == $user->store_id . '-' . $job->key) {
foreach ($jobs as $job) {
if ($log->check_value == $user->store_id.'-'.$job->key) {
return true;
}
}
}
return false;
}
@ -202,7 +210,7 @@ class WorkFlowService extends BaseService
{
if (isset($data['config'])) {
foreach ($data['config'] as $key => &$item) {
if (!$item) {
if (! $item) {
$data['config'] = null;
break;
}

2
app/Admin/routes.php
View File

@ -12,8 +12,8 @@ use App\Admin\Controllers\Finance\StoreStatisticController;
use App\Admin\Controllers\Hr\EmployeeController;
use App\Admin\Controllers\Hr\HolidayController;
use App\Admin\Controllers\Hr\OfficalBusinessController;
use App\Admin\Controllers\Hr\PromotionController;
use App\Admin\Controllers\Hr\OvertimeController;
use App\Admin\Controllers\Hr\PromotionController;
use App\Admin\Controllers\Hr\RestController;
use App\Admin\Controllers\Hr\SignController;
use App\Admin\Controllers\Hr\SignLogController;

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

@ -2,8 +2,8 @@
namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\Admin\Services\EmployeeSignService;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
class EmployeeSign extends Command

2
app/Models/Complaint.php
View File

@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
class Complaint extends Model
{
use Filterable, HasFactory, HasDateTimeFormatter;
use Filterable, HasDateTimeFormatter, HasFactory;
protected $attributes = [
'anonymous' => false,

2
app/Models/Employee.php
View File

@ -18,7 +18,7 @@ use Slowlyo\OwlAdmin\Models\AdminUser;
*/
class Employee extends Model implements AuthenticatableContract
{
use Authenticatable, HasApiTokens, Filterable, HasDateTimeFormatter;
use Authenticatable, Filterable, HasApiTokens, HasDateTimeFormatter;
const JOB_KEY = 'job';

6
app/Models/EmployeePromotion.php
View File

@ -2,18 +2,18 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\PromotionStatus;
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use App\Traits\HasCheckable;
use Illuminate\Database\Eloquent\Model;
/**
* 员工升职申请
*/
class EmployeePromotion extends Model
{
use Filterable, HasDateTimeFormatter, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter;
protected $fillable = ['store_id', 'employee_id', 'invitor_id', 'job_id', 'promotion_status', 'employee_data', 'remarks'];

4
app/Models/EmployeeSign.php
View File

@ -5,15 +5,15 @@ namespace App\Models;
use App\Enums\SignStatus;
use App\Enums\SignType;
use App\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Model;
use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Model;
/**
* 员工-打卡情况
*/
class EmployeeSign extends Model
{
use HasDateTimeFormatter, Filterable;
use Filterable, HasDateTimeFormatter;
protected $table = 'employee_sign_dates';

10
app/Models/EmployeeSignLog.php
View File

@ -2,19 +2,19 @@
namespace App\Models;
use App\Enums\{SignType, SignTime};
use Illuminate\Database\Eloquent\Model;
use App\Enums\SignTime;
use App\Enums\SignType;
use App\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use EloquentFilter\Filterable;
use App\Admin\Filters\EmployeeSignLogFilter;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
/**
* 员工-打卡流水
*/
class EmployeeSignLog extends Model
{
use HasDateTimeFormatter, HasFactory, Filterable;
use Filterable, HasDateTimeFormatter, HasFactory;
protected $table = 'employee_sign_logs';

6
app/Models/EmployeeSignRepair.php
View File

@ -2,18 +2,18 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\{SignTime};
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use App\Traits\HasCheckable;
use Illuminate\Database\Eloquent\Model;
/**
* 补卡申请
*/
class EmployeeSignRepair extends Model
{
use HasDateTimeFormatter, Filterable, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter;
protected $table = 'employee_sign_repairs';

2
app/Models/Feedback.php
View File

@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
class Feedback extends Model
{
use Filterable, HasFactory, HasDateTimeFormatter;
use Filterable, HasDateTimeFormatter, HasFactory;
protected $fillable = [
'employee_id', 'content',

4
app/Models/HolidayApply.php
View File

@ -2,11 +2,11 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\{CheckStatus};
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use App\Enums\{CheckStatus};
use Illuminate\Database\Eloquent\Model;
/**
* 请假申请

3
app/Models/Ledger.php
View File

@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
class Ledger extends Model
{
use Filterable, HasDateTimeFormatter, HasFactory, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter, HasFactory;
protected $appends = ['ledger_difference'];
@ -53,6 +53,7 @@ class Ledger extends Model
if (is_numeric($attributes['ledger_amount'])) {
return bcsub($attributes['handover_amount'], $attributes['ledger_amount'], 2);
}
return null;
},
);

1
app/Models/LedgerItem.php
View File

@ -4,7 +4,6 @@ namespace App\Models;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;

6
app/Models/OfficalBusiness.php
View File

@ -2,18 +2,18 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\{CheckStatus};
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use App\Enums\{CheckStatus};
use Illuminate\Database\Eloquent\Model;
/**
* 出差报备
*/
class OfficalBusiness extends Model
{
use HasCheckable, HasDateTimeFormatter, Filterable;
use Filterable, HasCheckable, HasDateTimeFormatter;
protected $table = 'offical_business';

6
app/Models/OvertimeApply.php
View File

@ -2,18 +2,18 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\{CheckStatus};
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use App\Enums\{CheckStatus};
use Illuminate\Database\Eloquent\Model;
/**
* 加班申请
*/
class OvertimeApply extends Model
{
use Filterable, HasDateTimeFormatter, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter;
protected $fillable = ['store_id', 'employee_id', 'date', 'start_at', 'end_at', 'hours', 'reason'];

2
app/Models/Reimbursement.php
View File

@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
class Reimbursement extends Model
{
use Filterable, HasDateTimeFormatter, HasFactory, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter, HasFactory;
protected $fillable = [
'employee_id',

2
app/Models/Store.php
View File

@ -6,8 +6,8 @@ use App\Enums\BusinessStatus;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
/**
* 门店

3
app/Models/StoreMasterCommission.php
View File

@ -2,7 +2,6 @@
namespace App\Models;
use App\Enums\StoreMasterCommissionApprovalStatus;
use App\Traits\HasCheckable;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
@ -12,7 +11,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
class StoreMasterCommission extends Model
{
use Filterable, HasDateTimeFormatter, HasFactory, HasCheckable;
use Filterable, HasCheckable, HasDateTimeFormatter, HasFactory;
protected $fillable = [
'month',

6
app/Models/WorkflowCheck.php
View File

@ -2,19 +2,17 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use App\Models\Employee;
use App\Enums\CheckStatus;
use App\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Model;
/**
* 审核申请
*/
class WorkflowCheck extends Model
{
use HasDateTimeFormatter, Filterable;
use Filterable, HasDateTimeFormatter;
protected $attributes = [
'check_status' => CheckStatus::None,

4
app/Traits/HasCheckActions.php
View File

@ -28,7 +28,7 @@ trait HasCheckActions
->label('取消审核')
->level('link')
->api(amisMake()->BaseApi()->url(admin_url('api/workflow/cancel'))->method('post')->data([
'id' => '${workflow.id}'
'id' => '${workflow.id}',
]))
->confirmText(__('admin.confirm'))
->visibleOn('${workflow.check_status == '.CheckStatus::Processing->value.'}');
@ -40,7 +40,7 @@ trait HasCheckActions
->AjaxAction()
->label('审核通过')
->level('link')
->api('post:' . admin_url('api/workflow/success?id=${id}'))
->api('post:'.admin_url('api/workflow/success?id=${id}'))
->confirmText(__('admin.confirm'))
->visibleOn('${workflow.check_status == '.CheckStatus::Processing->value.'}');
}

4
app/Traits/HasCheckable.php
View File

@ -2,9 +2,7 @@
namespace App\Traits;
use App\Enums\CheckStatus;
use App\Models\{WorkflowCheck, Employee};
use Illuminate\Database\Eloquent\Builder;
use App\Models\WorkflowCheck;
use Illuminate\Support\Str;
trait HasCheckable

2
bootstrap/helpers.php
View File

@ -15,7 +15,7 @@ if (! function_exists('trim_zeros')) {
$pos = strpos($var, '.');
if ($pos !== false) {
if ($pos === 0) {
$var = "0".$var;
$var = '0'.$var;
}
$var = rtrim(rtrim($var, '0'), '.');
}

52
config/admin.php
View File

@ -2,19 +2,19 @@
return [
// 应用名称
'name' => 'Owl Admin',
'name' => 'Owl Admin',
// 应用 logo
'logo' => '/admin-assets/logo.png',
'logo' => '/admin-assets/logo.png',
// 默认头像
'default_avatar' => '/admin-assets/default-avatar.png',
// 应用安装目录
'directory' => app_path('Admin'),
'directory' => app_path('Admin'),
// 引导文件
'bootstrap' => app_path('Admin/bootstrap.php'),
'bootstrap' => app_path('Admin/bootstrap.php'),
// 应用路由
'route' => [
@ -36,27 +36,27 @@ return [
'auth' => [
// 是否开启验证码
'login_captcha' => env('ADMIN_LOGIN_CAPTCHA', true),
'login_captcha' => env('ADMIN_LOGIN_CAPTCHA', true),
// 是否开启认证
'enable' => true,
'enable' => true,
// 是否开启鉴权
'permission' => true,
'permission' => true,
// token 有效期 (分钟), 为空则不会过期
'token_expiration' => null,
'guard' => 'admin',
'guards' => [
'guard' => 'admin',
'guards' => [
'admin' => [
'driver' => 'sanctum',
'driver' => 'sanctum',
'provider' => 'admin',
],
],
'providers' => [
'providers' => [
'admin' => [
'driver' => 'eloquent',
'model' => \App\Models\AdminUser::class,
],
],
'except' => [
'except' => [
],
],
@ -66,40 +66,40 @@ return [
// 文件上传目录
'directory' => [
'image' => 'images',
'file' => 'files',
'rich' => 'rich',
'file' => 'files',
'rich' => 'rich',
],
// 临时目录
'tem_directory' => [
'image' => 'temporary/images',
'file' => 'temporary/file',
'rich' => 'temporary/rich',
]
'file' => 'temporary/file',
'rich' => 'temporary/rich',
],
],
'https' => env('ADMIN_HTTPS', false),
'https' => env('ADMIN_HTTPS', false),
// 是否显示 [开发者工具]
'show_development_tools' => env('ADMIN_SHOW_DEVELOPMENT_TOOLS', true),
'show_development_tools' => env('ADMIN_SHOW_DEVELOPMENT_TOOLS', true),
// 是否显示 [权限] 功能中的自动生成按钮
'show_auto_generate_permission_button' => env('ADMIN_SHOW_AUTO_GENERATE_PERMISSION_BUTTON', true),
// 扩展
'extension' => [
'extension' => [
'dir' => base_path('extensions'),
],
'layout' => [
// 浏览器标题, 功能名称使用 %title% 代替
'title' => '%title% | OwlAdmin',
'header' => [
'title' => '%title% | OwlAdmin',
'header' => [
// 是否显示 [刷新] 按钮
'refresh' => true,
'refresh' => true,
// 是否显示 [暗色模式] 按钮
'dark' => true,
'dark' => true,
// 是否显示 [全屏] 按钮
'full_screen' => true,
'full_screen' => true,
// 是否显示 [主题配置] 按钮
'theme_config' => true,
],
@ -114,7 +114,7 @@ return [
*/
'keep_alive_exclude' => [],
// 底部信息
'footer' => '<a href="https://github.com/slowlyo/owl-admin" target="_blank">Owl Admin</a>',
'footer' => '<a href="https://github.com/slowlyo/owl-admin" target="_blank">Owl Admin</a>',
],
'database' => [

2
database/factories/ComplaintFactory.php
View File

@ -3,10 +3,8 @@
namespace Database\Factories;
use App\Enums\ComplaintStatus;
use App\Models\Employee;
use App\Models\Complaint;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Arr;
/**
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Complaint>

1
database/factories/EmployeeFactory.php
View File

@ -30,6 +30,7 @@ class EmployeeFactory extends Factory
'password' => AdminUser::where('id', 1)->value('password'),
'name' => $name,
]);
return [
'name' => $name,
'phone' => $phone,

11
database/factories/EmployeeSignLogFactory.php
View File

@ -2,10 +2,11 @@
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use App\Models\EmployeeSignLog;
use App\Enums\SignTime;
use App\Enums\SignType;
use App\Models\Employee;
use App\Enums\{SignType, SignTime};
use App\Models\EmployeeSignLog;
use Illuminate\Database\Eloquent\Factories\Factory;
/**
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\EmployeeSign>
@ -13,6 +14,7 @@ use App\Enums\{SignType, SignTime};
class EmployeeSignLogFactory extends Factory
{
protected $model = EmployeeSignLog::class;
/**
* Define the model's default state.
*
@ -23,6 +25,7 @@ class EmployeeSignLogFactory extends Factory
$employee = Employee::where('store_id', '>', 0)->inRandomOrder()->first();
$type = $this->faker->randomElement([SignType::Normal, SignType::Outside]);
$time = $this->faker->randomElement(SignTime::class);
return [
'store_id' => $employee->store_id,
'employee_id' => $employee->id,
@ -30,7 +33,7 @@ class EmployeeSignLogFactory extends Factory
'sign_time' => $time,
'remarks' => $type == SignType::Outside ? '我在外面的' : '',
'position' => ['province' => '重庆', 'city' => '重庆市', 'address' => '重庆市南川区东城街道办事处东环路三号'],
'time' => $this->faker->dateTimeBetween('-7 days', 'now')
'time' => $this->faker->dateTimeBetween('-7 days', 'now'),
];
}
}

2
database/factories/FeedbackFactory.php
View File

@ -2,10 +2,8 @@
namespace Database\Factories;
use App\Models\Employee;
use App\Models\Feedback;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Arr;
/**
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Feedback>

1
database/factories/StoreFactory.php
View File

@ -22,6 +22,7 @@ class StoreFactory extends Factory
public function definition(): array
{
$master = Employee::where('store_id', 0)->inRandomOrder()->first();
return [
'title' => $this->faker->word(),
'master_id' => $master->id,

2
database/migrations/2024_03_27_113404_create_workflows_table.php
View File

@ -1,9 +1,9 @@
<?php
use App\Enums\CheckStatus;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use App\Enums\CheckStatus;
return new class extends Migration
{

1
database/migrations/2024_03_27_140744_create_employee_sign_table.php
View File

@ -4,7 +4,6 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**

5
database/seeders/EmployeeSeeder.php
View File

@ -3,8 +3,9 @@
namespace Database\Seeders;
use App\Models\Employee;
use App\Models\EmployeeSign;
use App\Models\EmployeeSignLog;
use App\Models\Store;
use App\Models\{EmployeeSign, EmployeeSignLog};
use Database\Factories\EmployeeFactory;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
@ -19,7 +20,7 @@ class EmployeeSeeder extends Seeder
// DB::table('employee_jobs')->truncate();
// Employee::where('admin_user_id', '!=', 1)->delete();
// (new EmployeeFactory)->count(100)->create();
// Store::truncate();
// Store::factory()->count(10)->create();

2
database/seeders/WorkflowSeeder.php
View File

@ -14,7 +14,7 @@ class WorkflowSeeder extends Seeder
{
$now = now();
$config = json_encode([
["sort" => 1, "type" => "user", "user" => 1, "title" => "员工", "value" => 1, "subTitle" => "Admin"],
['sort' => 1, 'type' => 'user', 'user' => 1, 'title' => '员工', 'value' => 1, 'subTitle' => 'Admin'],
]);
Workflow::truncate();
Workflow::insert([