SamProject/sam-react-prod
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/components/accounting/ReceivablesStatus/index.tsx
This commit is contained in:
권혁성
2026-01-06 21:22:23 +09:00
parent ed40569ac9 6e483deea8
commit 50a01e1e47
230 changed files with 34200 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/accounting/WithdrawalManagement/WithdrawalDetail.tsx
View File

@@ -4,6 +4,7 @@ import { useState, useCallback, useEffect } from 'react';
import { useRouter } from 'next/navigation';
import {
Banknote,
List,
} from 'lucide-react';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -180,6 +181,7 @@ export function WithdrawalDetail({ withdrawalId, mode }: WithdrawalDetailProps)
{isViewMode ? (
<>
<Button variant="outline" onClick={handleBack}>
<List className="h-4 w-4 mr-2" />
목록
</Button>
<Button
@@ -190,7 +192,7 @@ export function WithdrawalDetail({ withdrawalId, mode }: WithdrawalDetailProps)
>
삭제
</Button>
<Button onClick={handleEdit} className="bg-orange-500 hover:bg-orange-600">
<Button onClick={handleEdit} className="bg-blue-500 hover:bg-blue-600">
수정
</Button>
</>
@@ -202,7 +204,7 @@ export function WithdrawalDetail({ withdrawalId, mode }: WithdrawalDetailProps)
</Button>
<Button
onClick={handleSave}
className="bg-orange-500 hover:bg-orange-600"
className="bg-blue-500 hover:bg-blue-600"
disabled={isLoading}
>
{isLoading ? '처리중...' : isNewMode ? '등록' : '저장'}

4
src/components/accounting/WithdrawalManagement/index.tsx
View File

@@ -489,7 +489,7 @@ export function WithdrawalManagement({ initialData, initialPagination }: Withdra
))}
</SelectContent>
</Select>
<Button onClick={handleSaveAccountSubject} className="bg-orange-500 hover:bg-orange-600">
<Button onClick={handleSaveAccountSubject} className="bg-blue-500 hover:bg-blue-600">
<Save className="h-4 w-4 mr-2" />
저장
</Button>
@@ -578,7 +578,7 @@ export function WithdrawalManagement({ initialData, initialPagination }: Withdra
</Button>
<Button
onClick={handleConfirmSaveAccountSubject}
className="bg-orange-500 hover:bg-orange-600"
className="bg-blue-500 hover:bg-blue-600"
>
확인
</Button>