From 48613ecc7019713636b494d3a38832e2c75ffed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Fri, 6 Mar 2026 15:38:51 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20[approvals]=20=EA=B5=AC=EB=A7=A4?= =?UTF-8?q?=ED=92=88=EC=9D=98=EC=84=9C=EC=97=90=20=EC=A7=80=EA=B8=89?= =?UTF-8?q?=EB=B0=A9=EB=B2=95(=EB=B2=95=EC=9D=B8=EC=B9=B4=EB=93=9C/?= =?UTF-8?q?=EA=B3=84=EC=A2=8C=EC=9D=B4=EC=B2=B4)=20=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partials/_purchase-request-form.blade.php | 20 ++++++++++++++++++- .../partials/_purchase-request-show.blade.php | 14 +++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/resources/views/approvals/partials/_purchase-request-form.blade.php b/resources/views/approvals/partials/_purchase-request-form.blade.php index ebd6adab..a16af7b9 100644 --- a/resources/views/approvals/partials/_purchase-request-form.blade.php +++ b/resources/views/approvals/partials/_purchase-request-form.blade.php @@ -296,6 +296,23 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline- class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"> + + {{-- 지급방법 --}} +
+ +
+ + +
+
@@ -649,6 +666,7 @@ function makeSchedule(data) { vendor_biz_no: initialData?.vendor_biz_no || '', delivery_date: initialData?.delivery_date || '', delivery_place: initialData?.delivery_place || '', + payment_method: initialData?.payment_method || '', // pr_trip traveler: initialData?.traveler || authUserName, @@ -838,7 +856,7 @@ function makeSchedule(data) { return { ...base, contract_party: this.formData.contract_party, contract_party_id: this.formData.contract_party_id, contract_party_biz_no: this.formData.contract_party_biz_no, contract_content: this.formData.contract_content, contract_start: this.formData.contract_start, contract_end: this.formData.contract_end, contract_amount: parseInt(this.formData.contract_amount) || 0, contract_scope: this.formData.contract_scope, delivery_service: this.formData.delivery_service, payment_terms: this.formData.payment_terms, special_terms: this.formData.special_terms }; } if (this.prType === 'pr_purchase') { - return { ...base, items: cleanItems(), total_amount: this.totalAmount, vendor: this.formData.vendor, vendor_id: this.formData.vendor_id, vendor_biz_no: this.formData.vendor_biz_no, delivery_date: this.formData.delivery_date, delivery_place: this.formData.delivery_place }; + return { ...base, items: cleanItems(), total_amount: this.totalAmount, vendor: this.formData.vendor, vendor_id: this.formData.vendor_id, vendor_biz_no: this.formData.vendor_biz_no, delivery_date: this.formData.delivery_date, delivery_place: this.formData.delivery_place, payment_method: this.formData.payment_method }; } if (this.prType === 'pr_trip') { return { ...base, traveler: this.formData.traveler, destination: this.formData.destination, trip_start: this.formData.trip_start, trip_end: this.formData.trip_end, schedules: this.formData.schedules.map(s => ({ date: s.date, destination: s.destination, task: s.task })), trip_expenses: { ...this.formData.trip_expenses }, trip_expense_total: this.tripExpenseTotal }; diff --git a/resources/views/approvals/partials/_purchase-request-show.blade.php b/resources/views/approvals/partials/_purchase-request-show.blade.php index dbed3d83..60eec0b2 100644 --- a/resources/views/approvals/partials/_purchase-request-show.blade.php +++ b/resources/views/approvals/partials/_purchase-request-show.blade.php @@ -206,6 +206,20 @@
{{ $content['delivery_place'] }}
@endif + @if(!empty($content['payment_method'])) +
+ 지급방법 +
+ @if($content['payment_method'] === 'corporate_card') + 법인카드 + @elseif($content['payment_method'] === 'bank_transfer') + 계좌이체 + @else + {{ $content['payment_method'] }} + @endif +
+
+ @endif @endif