Fix: Добавлена организация в элементы заявки

 organization relationship в CourseRequestItem
 Отображение в show.blade.php
 Загрузка в контроллере

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad 2026-04-01 16:19:56 +08:00
parent c6f303fac7
commit 38b2f043bf
3 changed files with 11 additions and 2 deletions

View File

@ -178,7 +178,7 @@ class CourseRequestController extends Controller
{ {
Gate::authorize('view', $courseRequest); Gate::authorize('view', $courseRequest);
$courseRequest->load(['organization', 'requestedBy', 'approvedBy', 'items.course', 'items.user', 'items.group']); $courseRequest->load(['organization', 'requestedBy', 'approvedBy', 'items.course', 'items.user', 'items.group', 'items.organization']);
return view('admin.course-requests.show', compact('courseRequest')); return view('admin.course-requests.show', compact('courseRequest'));
} }

View File

@ -44,6 +44,11 @@ class CourseRequestItem extends Model
return $this->belongsTo(Group::class); return $this->belongsTo(Group::class);
} }
public function organization(): BelongsTo
{
return $this->belongsTo(Organization::class);
}
public function getTypeAttribute(): string public function getTypeAttribute(): string
{ {
if ($this->user_id) { if ($this->user_id) {

View File

@ -95,8 +95,10 @@
<span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span> <span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
@elseif($item->group_id) @elseif($item->group_id)
<span class="badge bg-info"><i class="bi bi-people"></i> Группе</span> <span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
@else @elseif($item->organization_id)
<span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span> <span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
@else
<span class="badge bg-secondary"><i class="bi bi-building"></i> Организации заявки</span>
@endif @endif
</td> </td>
<td> <td>
@ -104,6 +106,8 @@
{{ $item->user?->name ?? '—' }} {{ $item->user?->name ?? '—' }}
@elseif($item->group_id) @elseif($item->group_id)
{{ $item->group?->name ?? '—' }} {{ $item->group?->name ?? '—' }}
@elseif($item->organization_id)
{{ $item->organization?->name ?? '—' }}
@else @else
{{ $courseRequest->organization->name }} {{ $courseRequest->organization->name }}
@endif @endif