From 7446150844a256222d73382fedc019f116df2b58 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Sun, 7 Apr 2024 13:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BE=E6=8A=A5=E6=8A=95=E8=AF=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Complaint/ComplaintController.php | 20 +++++++++++++++++-- app/Admin/routes.php | 2 +- database/seeders/AdminPermissionSeeder.php | 2 +- lang/zh_CN/complaint.php | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/Admin/Controllers/Complaint/ComplaintController.php b/app/Admin/Controllers/Complaint/ComplaintController.php index 841831f..36a9725 100644 --- a/app/Admin/Controllers/Complaint/ComplaintController.php +++ b/app/Admin/Controllers/Complaint/ComplaintController.php @@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Validator; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\AjaxAction; use Slowlyo\OwlAdmin\Renderers\DrawerAction; +use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; /** @@ -43,7 +44,7 @@ class ComplaintController extends AdminController ]), ])) ->columns([ - amis()->TableColumn()->name('id')->label(__('complaint.complaint.id')), + amis()->TableColumn()->name('created_at')->label(__('complaint.complaint.created_at')), amis()->TableColumn() ->name('_employee') ->label(__('complaint.complaint.employee')) @@ -65,7 +66,6 @@ class ComplaintController extends AdminController ->label(__('complaint.complaint.complaint_status')) ->type('mapping') ->map(ComplaintStatus::labelMap()), - amis()->TableColumn()->name('created_at')->label(__('complaint.complaint.created_at')), $this->rowActions([ $this->rowProcessStartButton() ->visible(Admin::user()->can('complaint.complaints.start')) @@ -73,12 +73,28 @@ class ComplaintController extends AdminController $this->rowProcessCompleteButton() ->visible(Admin::user()->can('complaint.complaints.complete')) ->visibleOn('${complaint_status === '.ComplaintStatus::Processing->value.'}'), + $this->rowShowButton() + ->visible(Admin::user()->can('admin.complaint.complaints.view')), ]), ]); return $this->baseList($crud); } + public function detail(): Form + { + return $this->baseDetail()->title('')->body([ + amis()->Property()->items([ + ['label' => __('complaint.complaint.employee'), 'content' => '${anonymous ? "匿名" : employee.name}'], + ['label' => __('complaint.complaint.created_at'), 'content' => '${created_at}'], + ['label' => __('complaint.complaint.complaint_status'), 'content' => amis()->Mapping()->name('complaint_status')->map(ComplaintStatus::labelMap())], + ['label' => __('complaint.complaint.content'), 'content' => '${content}', 'span' => 3], + ['label' => __('complaint.complaint.result'), 'content' => '${result}', 'span' => 3], + ['label' => __('complaint.complaint.photos'), 'content' => amis()->Images()->enlargeAble()->source('${photos}')->enlargeWithGallary(), 'span' => 3], + ]), + ]); + } + /** * 处理开始 */ diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 8f5d3b5..564904c 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -108,7 +108,7 @@ Route::group([ 'as' => 'complaint.', ], function (Router $router) { // 举报投诉 - $router->resource('complaints', ComplaintController::class)->only(['index']); + $router->resource('complaints', ComplaintController::class)->only(['index', 'show']); $router->post('complaints/{complaint}/start', [ComplaintController::class, 'start'])->name('complaints.start'); $router->post('complaints/{complaint}/complete', [ComplaintController::class, 'complete'])->name('complaints.complete'); // 意见箱 diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index 465ac7b..739a050 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -169,7 +169,7 @@ class AdminPermissionSeeder extends Seeder 'name' => '举报投诉', 'icon' => 'pixelarticons:list-box', 'uri' => '/complaint/complaints', - 'resource' => ['list'], + 'resource' => ['list', 'view'], 'children' => [ 'start' => '开始', 'complete' => '完成', diff --git a/lang/zh_CN/complaint.php b/lang/zh_CN/complaint.php index 04d1f7c..8edea1b 100644 --- a/lang/zh_CN/complaint.php +++ b/lang/zh_CN/complaint.php @@ -10,6 +10,7 @@ return [ 'created_at' => '投诉时间', 'start' => '开始', 'complete' => '完成', + 'photos' => '证明材料', ], 'feedback' => [