From 16ad46304dc89993a178507d1ec7cb5c7d44c341 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Fri, 18 Nov 2022 19:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=9A=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/HostController.php | 1 + .../Controllers/Admin/WorkOrderController.php | 9 ++++- resources/views/admin/hosts/index.blade.php | 7 +++- resources/views/admin/users/edit.blade.php | 2 +- .../views/admin/work-orders/show.blade.php | 34 +++++++++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 resources/views/admin/work-orders/show.blade.php diff --git a/app/Http/Controllers/Admin/HostController.php b/app/Http/Controllers/Admin/HostController.php index a4ae7e2..39427e6 100644 --- a/app/Http/Controllers/Admin/HostController.php +++ b/app/Http/Controllers/Admin/HostController.php @@ -16,6 +16,7 @@ class HostController extends Controller */ public function index(Host $host) { + $host->load('user'); $hosts = $host->paginate(100); return view('admin.hosts.index', compact('hosts')); diff --git a/app/Http/Controllers/Admin/WorkOrderController.php b/app/Http/Controllers/Admin/WorkOrderController.php index 10503cd..2c3912c 100644 --- a/app/Http/Controllers/Admin/WorkOrderController.php +++ b/app/Http/Controllers/Admin/WorkOrderController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\WorkOrder\Reply; use App\Models\WorkOrder\WorkOrder; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -48,10 +49,16 @@ public function store(Request $request) * @param \App\Models\WorkOrder\WorkOrder $workOrder * @return Response */ - public function show(WorkOrder $workOrder) + public function show(WorkOrder $workOrder): View { // + $workOrder->load(['user', 'module']); + + $replies = Reply::where('work_order_id', $workOrder->id)->paginate(100); + + return view('admin.work-orders.show', compact('workOrder', 'replies')); + } /** diff --git a/resources/views/admin/hosts/index.blade.php b/resources/views/admin/hosts/index.blade.php index b2db24e..5626e5d 100644 --- a/resources/views/admin/hosts/index.blade.php +++ b/resources/views/admin/hosts/index.blade.php @@ -10,6 +10,7 @@ ID 模块 名称 + 用户 创建时间 更新时间 操作 @@ -24,11 +25,15 @@ - {{ $host->module_id }} + {{ $host->module_id }} {{ $host->name }} + + {{ $host->user->name }} + {{ $host->created_at }} diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 1fd790e..11cd0cc 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -79,7 +79,7 @@ - 编辑 + 编辑 @endforeach diff --git a/resources/views/admin/work-orders/show.blade.php b/resources/views/admin/work-orders/show.blade.php new file mode 100644 index 0000000..a771461 --- /dev/null +++ b/resources/views/admin/work-orders/show.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.admin') + +@section('title', '工单: ' . $workOrder->title) + +@section('content') +

{{ $workOrder->title }}

+
{{ \Illuminate\Mail\Markdown::parse($workOrder->content) }}
+ + + +

在这里,您无法回复工单,只能够查看。

+
+ +

对话记录

+ + @foreach($replies as $reply) +
+
+ @if ($reply->user_id) + {{ $workOrder->user->name }} + @else + {{ $workOrder->module->name }} + @endif + + {{ $reply->created_at }} +
+ +
+ {{ \Illuminate\Mail\Markdown::parse($reply->content) }} +
+
+ @endforeach +
+@endsection