+
+
+
+
카드를 선택하세요
- {{-- 송금: 선택 계좌 자동표시 / 기타: 수동입력 --}}
+ {{-- 송금/자동이체: 선택 계좌 자동표시 / 기타: 수동입력 --}}
-
+
-
+
|
-
+
-
+
|
-
+
-
+
@@ -358,12 +363,14 @@ function makeItem(data) {
expenseTypes: [
{ value: 'corporate_card', label: '법인카드' },
{ value: 'transfer', label: '송금' },
+ { value: 'auto_transfer', label: '자동이체 출금' },
{ value: 'cash_advance', label: '현금/가지급정산' },
{ value: 'welfare_card', label: '복지카드' },
],
taxInvoiceTypes: [
{ value: 'normal', label: '일반' },
{ value: 'deferred', label: '이월발행' },
+ { value: 'none', label: '없음' },
],
cards: cardsData || [],
accounts: accountsData || [],
@@ -372,6 +379,7 @@ function makeItem(data) {
expense_type: initialData?.expense_type || 'corporate_card',
tax_invoice: initialData?.tax_invoice || 'normal',
write_date: initialData?.write_date || today,
+ approval_date: initialData?.approval_date || '',
department: initialData?.department || '본사',
writer_name: initialData?.writer_name || authUserName,
items: items,
@@ -424,7 +432,7 @@ function makeItem(data) {
},
initAutoSelect() {
- if (this.formData.expense_type === 'transfer' && !this.formData.selected_account && this.accounts.length > 0) {
+ if ((this.formData.expense_type === 'transfer' || this.formData.expense_type === 'auto_transfer') && !this.formData.selected_account && this.accounts.length > 0) {
const primary = this.accounts.find(a => a.is_primary);
this.selectAccount(primary || this.accounts[0]);
}
@@ -539,7 +547,7 @@ function makeItem(data) {
getFormData() {
const isCard = this.formData.expense_type === 'corporate_card';
- const isTransfer = this.formData.expense_type === 'transfer';
+ const isTransfer = this.formData.expense_type === 'transfer' || this.formData.expense_type === 'auto_transfer';
const acct = this.formData.selected_account;
const card = this.formData.selected_card;
@@ -547,6 +555,7 @@ function makeItem(data) {
expense_type: this.formData.expense_type,
tax_invoice: this.formData.tax_invoice,
write_date: this.formData.write_date,
+ approval_date: this.formData.approval_date,
department: this.formData.department,
writer_name: this.formData.writer_name,
items: this.formData.items.map(item => ({
diff --git a/resources/views/approvals/partials/_expense-show.blade.php b/resources/views/approvals/partials/_expense-show.blade.php
index e7ccf5e2..587098b1 100644
--- a/resources/views/approvals/partials/_expense-show.blade.php
+++ b/resources/views/approvals/partials/_expense-show.blade.php
@@ -7,12 +7,14 @@
$expenseTypeLabels = [
'corporate_card' => '법인카드',
'transfer' => '송금',
+ 'auto_transfer' => '자동이체 출금',
'cash_advance' => '현금/가지급정산',
'welfare_card' => '복지카드',
];
$taxInvoiceLabels = [
'normal' => '일반',
'deferred' => '이월발행',
+ 'none' => '없음',
];
@endphp
@@ -31,6 +33,10 @@
작성일자
{{ $content['write_date'] ?? '-' }}
+
+ 결재일자
+ {{ $content['approval_date'] ?? '-' }}
+
지출부서
{{ $content['department'] ?? '-' }}
@@ -60,7 +66,7 @@
@endif
{{-- 선택된 출금 계좌 --}}
- @if(($content['expense_type'] ?? '') === 'transfer' && !empty($content['selected_account']))
+ @if(in_array($content['expense_type'] ?? '', ['transfer', 'auto_transfer']) && !empty($content['selected_account']))
@php $account = $content['selected_account']; @endphp
|