From 2e999114aee7fc4e7e550475710520a67722f8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Thu, 5 Mar 2026 11:29:18 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[approval]=20=EA=B2=B0=EC=9E=AC=EC=84=9C?= =?UTF-8?q?=EB=AA=85=EB=9E=80=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=ED=99=95=EB=8C=80=20(150%=20=EB=84=88=EB=B9=84,=20?= =?UTF-8?q?130%=20=EA=B8=80=EC=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 셀 패딩 10px→16px, min-width 64px→96px - 기본 폰트 12px→15px, 도장 32px→42px - 결재 헤더 13px→16px, 이름/날짜 비례 확대 --- .../partials/_approval-stamp-table.blade.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/views/approvals/partials/_approval-stamp-table.blade.php b/resources/views/approvals/partials/_approval-stamp-table.blade.php index 746247dc..9ac63fcc 100644 --- a/resources/views/approvals/partials/_approval-stamp-table.blade.php +++ b/resources/views/approvals/partials/_approval-stamp-table.blade.php @@ -8,71 +8,71 @@ $approverSteps = $approval->steps->whereIn('step_type', ['approval', 'agreement'])->sortBy('step_order')->values(); @endphp - +
{{-- 1행: 직급/역할 --}} - - @foreach($approverSteps as $step) - @endforeach {{-- 2행: 서명/도장 영역 --}} - @foreach($approverSteps as $step) - @endforeach {{-- 3행: 이름 + 처리일시 --}} - @foreach($approverSteps as $step) -
+ 결재 + 작성자 + {{ $step->approver_position ?: ($step->step_type === 'agreement' ? '합의' : '결재') }}
+ @if(in_array($approval->status, ['pending', 'approved', 'rejected', 'cancelled', 'on_hold'])) - {{ $drafter?->name ?? '-' }} + {{ $drafter?->name ?? '-' }} @endif + @if($step->status === 'approved') @if(($step->approval_type ?? 'normal') === 'pre_decided') -
+
전결
@else -
+
승인
@endif @elseif($step->status === 'rejected') -
+
반려
@elseif($step->status === 'on_hold') -
+
보류
@elseif($step->status === 'skipped') - - + - @endif
+ @if(in_array($approval->status, ['pending', 'approved', 'rejected', 'cancelled', 'on_hold'])) -
+
{{ $approval->drafted_at?->format('m/d') ?? '' }}
@endif
-
+
+
{{ $step->approver_name ?? ($step->approver?->name ?? '') }}
@if($step->acted_at) -
+
{{ $step->acted_at->format('m/d') }}
@endif