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

Fix

main
Jing Li 2024-04-22 19:49:22 +08:00
parent 35f8525261
commit d239c49c69
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Admin/Controllers/Plan/PlanController.php
View File

@ -209,7 +209,7 @@ class PlanController extends AdminController
amis()->TableColumn('completed_at', __('plan.task.completed_at')), amis()->TableColumn('completed_at', __('plan.task.completed_at')),
amis()->TableColumn('created_at', __('plan.task.created_at')), amis()->TableColumn('created_at', __('plan.task.created_at')),
]) ])
->visibleOn('${planable_type == "'.$planableTypeLedger.'"}'), ->visibleOn('${plan_status == '.PlanStatus::Pending->value.' and planable_type == "'.$planableTypeLedger.'"}'),
// 业绩指标 // 业绩指标
amis()->CRUDTable() amis()->CRUDTable()
@ -236,7 +236,7 @@ class PlanController extends AdminController
->visible(Admin::user()->can('admin.plan.plans.task_delete')), ->visible(Admin::user()->can('admin.plan.plans.task_delete')),
]), ]),
]) ])
->visibleOn('${planable_type == "'.$planableTypePerformance.'"}'), ->visibleOn('${plan_status == '.PlanStatus::Pending->value.' and planable_type == "'.$planableTypePerformance.'"}'),
// 清洁卫生 // 清洁卫生
amis()->CRUDTable() amis()->CRUDTable()
@ -261,7 +261,7 @@ class PlanController extends AdminController
->visible(Admin::user()->can('admin.plan.plans.task_delete')), ->visible(Admin::user()->can('admin.plan.plans.task_delete')),
]), ]),
]) ])
->visibleOn('${planable_type == "'.$planableTypeHygiene.'"}'), ->visibleOn('${plan_status == '.PlanStatus::Pending->value.' and planable_type == "'.$planableTypeHygiene.'"}'),
]); ]);
} }

5
app/Admin/Services/Plan/TaskService.php
View File

@ -44,8 +44,13 @@ class TaskService extends BaseService
admin_abort('任务计划未找到'); admin_abort('任务计划未找到');
} }
/** @var \App\Models\Plan */
$plan = Plan::findOrFail($data['plan_id']); $plan = Plan::findOrFail($data['plan_id']);
if (! $plan->isPublished()) {
admin_abort('任务计划未发布');
}
switch (get_class($planable = $plan->planable)) { switch (get_class($planable = $plan->planable)) {
// 业绩指标 // 业绩指标
case PlanPerformance::class: case PlanPerformance::class: