diff --git a/app/Admin/Controllers/Plan/PlanController.php b/app/Admin/Controllers/Plan/PlanController.php index 34cc2ec..24f245b 100644 --- a/app/Admin/Controllers/Plan/PlanController.php +++ b/app/Admin/Controllers/Plan/PlanController.php @@ -178,7 +178,7 @@ class PlanController extends AdminController amis()->TableColumn('name', __('plan.task.name')), amis()->TableColumn('taskable.date', __('plan.task_ledger.date')), amis()->TableColumn('taskable.store.title', __('plan.task_ledger.store')), - amis()->TableColumn('taskable.store.master.name', __('plan.task_ledger.store_master')), + amis()->TableColumn('taskable.store_master.name', __('plan.task_ledger.store_master')), amis()->TableColumn('task_status', __('plan.task.status'))->type('mapping')->map(TaskStatus::labelMap()), amis()->TableColumn('completed_at', __('plan.task.completed_at')), amis()->TableColumn('created_at', __('plan.task.created_at')), diff --git a/app/Admin/Controllers/Plan/TaskController.php b/app/Admin/Controllers/Plan/TaskController.php index 32298d6..f0a81f2 100644 --- a/app/Admin/Controllers/Plan/TaskController.php +++ b/app/Admin/Controllers/Plan/TaskController.php @@ -23,7 +23,7 @@ class TaskController extends AdminController ->with([ 'taskable' => function (MorphTo $morphTo) { $morphTo->morphWith([ - TaskLedger::class => ['store.master'], + TaskLedger::class => ['store', 'storeMaster'], ]); }, ]) diff --git a/app/Console/Commands/TaskLedgerGenerateCommand.php b/app/Console/Commands/TaskLedgerGenerateCommand.php index 52e88c9..84edba3 100644 --- a/app/Console/Commands/TaskLedgerGenerateCommand.php +++ b/app/Console/Commands/TaskLedgerGenerateCommand.php @@ -56,7 +56,7 @@ class TaskLedgerGenerateCommand extends Command $planable->save(); $plan = $planable->plan()->create([ - 'name' => "{$planable->date} 总账录入", + 'name' => "【{$planable->date}】总账录入", 'plan_status' => PlanStatus::Published, ]); diff --git a/app/Models/TaskLedger.php b/app/Models/TaskLedger.php index 00a525a..2be71f8 100644 --- a/app/Models/TaskLedger.php +++ b/app/Models/TaskLedger.php @@ -27,4 +27,9 @@ class TaskLedger extends Model { return $this->belongsTo(Store::class); } + + public function storeMaster(): BelongsTo + { + return $this->belongsTo(Employee::class, 'store_master_id'); + } }