diff --git a/src/components/settings/AccountInfoManagement/index.tsx b/src/components/settings/AccountInfoManagement/index.tsx index c762ef66..e1c436c8 100644 --- a/src/components/settings/AccountInfoManagement/index.tsx +++ b/src/components/settings/AccountInfoManagement/index.tsx @@ -353,7 +353,7 @@ export function AccountInfoClient({
{/* 이메일 수신 동의 */} -
+
{/* SMS 수신 동의 */} -
+
state.sidebarCollapsed); const [mode, setMode] = useState(initialMode); const deleteDialog = useDeleteDialog({ onDelete: async (id) => deleteBankAccount(Number(id)), @@ -185,22 +187,28 @@ export function AccountDetail({ account, mode: initialMode }: AccountDetailProps - {/* 버튼 영역 */} -
-
+ + {/* 하단 액션 버튼 (sticky) */} +
+ +
+ + -
- - -
@@ -330,17 +338,18 @@ export function AccountDetail({ account, mode: initialMode }: AccountDetailProps - {/* 버튼 영역 */} -
- - -
+
+ + {/* 하단 액션 버튼 (sticky) */} +
+ +
); diff --git a/src/components/settings/AccountManagement/AccountDetailForm.tsx b/src/components/settings/AccountManagement/AccountDetailForm.tsx index e00f644e..a6d419fb 100644 --- a/src/components/settings/AccountManagement/AccountDetailForm.tsx +++ b/src/components/settings/AccountManagement/AccountDetailForm.tsx @@ -12,7 +12,7 @@ import { useState, useCallback, useMemo } from 'react'; import { useRouter } from 'next/navigation'; -import { Landmark, Save, Trash2, ArrowLeft } from 'lucide-react'; +import { Landmark, Save, Trash2, ArrowLeft, Edit } from 'lucide-react'; import { toast } from 'sonner'; import { Button } from '@/components/ui/button'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; @@ -20,6 +20,7 @@ import { DeleteConfirmDialog } from '@/components/ui/confirm-dialog'; import { PageLayout } from '@/components/organisms/PageLayout'; import { PageHeader } from '@/components/organisms/PageHeader'; import { FormField } from '@/components/molecules/FormField'; +import { useMenuStore } from '@/stores/menuStore'; import type { Account, AccountCategory, AccountFormData } from './types'; import { ACCOUNT_CATEGORY_OPTIONS, @@ -98,6 +99,7 @@ export function AccountDetailForm({ isLoading, }: AccountDetailFormProps) { const router = useRouter(); + const sidebarCollapsed = useMenuStore((state) => state.sidebarCollapsed); const [mode, setMode] = useState(initialMode); const [formData, setFormData] = useState(() => getInitialFormData(initialData)); const [isSaving, setIsSaving] = useState(false); @@ -216,7 +218,7 @@ export function AccountDetailForm({ icon={Landmark} /> -
+
{/* ===== 기본 정보 ===== */} @@ -321,26 +323,30 @@ export function AccountDetailForm({ )} - {/* ===== 하단 버튼 ===== */} -
- -
+
{isViewMode ? ( <> {onDelete && ( )} - + ) : ( <> @@ -348,15 +354,16 @@ export function AccountDetailForm({ )} - )} diff --git a/src/components/settings/AccountManagement/index.tsx b/src/components/settings/AccountManagement/index.tsx index f3827391..b8f7a1b3 100644 --- a/src/components/settings/AccountManagement/index.tsx +++ b/src/components/settings/AccountManagement/index.tsx @@ -344,6 +344,7 @@ export function AccountManagement() { {ACCOUNT_STATUS_LABELS[item.status]} } + showCheckbox={false} isSelected={false} onToggleSelection={() => {}} onClick={() => handleRowClick(item)} diff --git a/src/components/settings/AttendanceSettingsManagement/index.tsx b/src/components/settings/AttendanceSettingsManagement/index.tsx index 1c069d98..fc02cf19 100644 --- a/src/components/settings/AttendanceSettingsManagement/index.tsx +++ b/src/components/settings/AttendanceSettingsManagement/index.tsx @@ -181,12 +181,10 @@ export function AttendanceSettingsManagement() { GPS 출퇴근 - + {/* GPS 출퇴근 사용 + 연동 부서 */} -
-
- GPS 출퇴근 -
+
+ GPS 출퇴근 -
+
연동 부서
{/* 출퇴근 허용 반경 */} -
-
- 출퇴근 허용 반경 -
+
+ 출퇴근 허용 반경 - onChange({ ...item, soundType: value }) - } - disabled={isDisabled} - > - - - - - {SOUND_OPTIONS.map((option) => ( - - {option.label} - - ))} - - - +
+ 알림 소리 선택 +
+ + +
{/* 추가 알림 선택 */} -
- 추가 알림 선택 +
+ 추가 알림 선택