From 9b5184cbbfb8123cdc25ff09bce5815dce076d92 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Sun, 21 Apr 2024 16:37:50 +0800 Subject: [PATCH] Update --- app/Admin/Controllers/AgreementController.php | 2 +- app/Admin/Controllers/Finance/LedgerController.php | 2 +- .../Controllers/Finance/ReimbursementController.php | 2 +- .../Finance/StoreMasterCommissionController.php | 2 +- app/Admin/Controllers/Hr/HolidayController.php | 2 +- .../Controllers/Hr/OfficalBusinessController.php | 2 +- app/Admin/Controllers/Hr/OvertimeController.php | 2 +- app/Admin/Controllers/Hr/PromotionController.php | 4 ++-- app/Admin/Controllers/Hr/SignRepairController.php | 2 +- app/Traits/HasCheckActions.php | 13 ++++++++++--- database/seeders/AdminSeeder.php | 1 + 11 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/Admin/Controllers/AgreementController.php b/app/Admin/Controllers/AgreementController.php index 721300c..bbe947c 100644 --- a/app/Admin/Controllers/AgreementController.php +++ b/app/Admin/Controllers/AgreementController.php @@ -124,7 +124,7 @@ class AgreementController extends AdminController ])->body([ $detail, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } diff --git a/app/Admin/Controllers/Finance/LedgerController.php b/app/Admin/Controllers/Finance/LedgerController.php index dfbd616..d432c3b 100644 --- a/app/Admin/Controllers/Finance/LedgerController.php +++ b/app/Admin/Controllers/Finance/LedgerController.php @@ -165,7 +165,7 @@ class LedgerController extends AdminController ['label' => __('workflow_log.remarks'), 'content' => '${workflow.check_remarks}'], ]), amis()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } diff --git a/app/Admin/Controllers/Finance/ReimbursementController.php b/app/Admin/Controllers/Finance/ReimbursementController.php index 320c018..056f6d8 100644 --- a/app/Admin/Controllers/Finance/ReimbursementController.php +++ b/app/Admin/Controllers/Finance/ReimbursementController.php @@ -90,7 +90,7 @@ class ReimbursementController extends AdminController ['label' => __('workflow_log.remarks'), 'content' => '${workflow.check_remarks}'], ]), amis()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Finance/StoreMasterCommissionController.php b/app/Admin/Controllers/Finance/StoreMasterCommissionController.php index 4b1649c..d3b5a4d 100644 --- a/app/Admin/Controllers/Finance/StoreMasterCommissionController.php +++ b/app/Admin/Controllers/Finance/StoreMasterCommissionController.php @@ -152,7 +152,7 @@ class StoreMasterCommissionController extends AdminController ['label' => __('workflow_log.remarks'), 'content' => '${workflow.check_remarks}', 'span' => 2], ]), amis()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Hr/HolidayController.php b/app/Admin/Controllers/Hr/HolidayController.php index e5ffd91..6c88569 100644 --- a/app/Admin/Controllers/Hr/HolidayController.php +++ b/app/Admin/Controllers/Hr/HolidayController.php @@ -133,7 +133,7 @@ class HolidayController extends AdminController ])->body([ $detail, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Hr/OfficalBusinessController.php b/app/Admin/Controllers/Hr/OfficalBusinessController.php index 6fe2189..5e00191 100644 --- a/app/Admin/Controllers/Hr/OfficalBusinessController.php +++ b/app/Admin/Controllers/Hr/OfficalBusinessController.php @@ -119,7 +119,7 @@ class OfficalBusinessController extends AdminController ])->body([ $detail, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Hr/OvertimeController.php b/app/Admin/Controllers/Hr/OvertimeController.php index a89263f..a8a72e2 100644 --- a/app/Admin/Controllers/Hr/OvertimeController.php +++ b/app/Admin/Controllers/Hr/OvertimeController.php @@ -123,7 +123,7 @@ class OvertimeController extends AdminController ])->body([ $detail, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Hr/PromotionController.php b/app/Admin/Controllers/Hr/PromotionController.php index c6db62f..c85bbb7 100644 --- a/app/Admin/Controllers/Hr/PromotionController.php +++ b/app/Admin/Controllers/Hr/PromotionController.php @@ -123,7 +123,7 @@ class PromotionController extends AdminController ['label' => __('employee_promotion.invitor_id'), 'content' => '${invitor.name}'], ['label' => __('employee_promotion.promotion_status'), 'content' => amisMake()->Mapping()->name('promotion_status')->map(PromotionStatus::options())], ['label' => __('employee_promotion.remarks'), 'content' => '${remarks}'], - ['label' => __('employee_promotion.created_at'), 'content' => '${created_at}', 'span' => 3], + ['label' => __('employee_promotion.created_at'), 'content' => '${created_at}', 'span' => 3], ]); $data = amisMake()->Property()->items([ @@ -149,7 +149,7 @@ class PromotionController extends AdminController amisMake()->Divider()->title('补充资料'), $data, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Admin/Controllers/Hr/SignRepairController.php b/app/Admin/Controllers/Hr/SignRepairController.php index 68ab189..1108490 100644 --- a/app/Admin/Controllers/Hr/SignRepairController.php +++ b/app/Admin/Controllers/Hr/SignRepairController.php @@ -127,7 +127,7 @@ class SignRepairController extends AdminController ])->body([ $detail, amisMake()->Divider(), - $this->baseWorkflowLogService($detailId)->id($serviceId), + $this->baseWorkflowLogList($detailId)->id($serviceId), ]); } } diff --git a/app/Traits/HasCheckActions.php b/app/Traits/HasCheckActions.php index c54ad06..c12794c 100644 --- a/app/Traits/HasCheckActions.php +++ b/app/Traits/HasCheckActions.php @@ -60,8 +60,15 @@ trait HasCheckActions ->visibleOn('${check_status == '.CheckStatus::Processing->value.'}'); } - public function baseWorkflowLogService($reload = null): Service + /** + * 审批流水 + */ + public function baseWorkflowLogList($reloadAfterCheckSuccess = null, $reloadAfterCheckFailed = null): Service { + if (func_num_args() === 1 && ! is_null($reloadAfterCheckSuccess)) { + $reloadAfterCheckFailed = $reloadAfterCheckSuccess; + } + return amis()->Service() ->initFetch(false) ->api(admin_url('api/workflow/logs?id=${workflow.id}')) @@ -74,8 +81,8 @@ trait HasCheckActions amis()->TableColumn()->name('checked_at')->label(__('workflow_log.checked_at')), amis()->TableColumn()->name('remarks')->label(__('workflow_log.remarks')), ])->itemActions([ - $this->succesAction()->visibleOn('${checkable}')->reload($reload), - $this->failAction()->visibleOn('${checkable}')->reload($reload), + $this->succesAction()->visibleOn('${checkable}')->reload($reloadAfterCheckSuccess), + $this->failAction()->visibleOn('${checkable}')->reload($reloadAfterCheckFailed), ]) ); } diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php index c288d42..eeb9a3d 100644 --- a/database/seeders/AdminSeeder.php +++ b/database/seeders/AdminSeeder.php @@ -22,6 +22,7 @@ class AdminSeeder extends Seeder 'password' => bcrypt('admin'), 'name' => 'Administrator', ]); + DB::table('employees')->truncate(); DB::table('employees')->insert([ 'name' => 'admin', 'phone' => '12345678900',