diff --git a/frontend/src/components/dashboard/DepartmentColumn.tsx b/frontend/src/components/dashboard/DepartmentColumn.tsx index 0116670..d07b714 100644 --- a/frontend/src/components/dashboard/DepartmentColumn.tsx +++ b/frontend/src/components/dashboard/DepartmentColumn.tsx @@ -229,41 +229,57 @@ export function DepartmentColumn({ title: initialTitle, titleEn, subtitle: initi )} - {/* 업무 카드 목록 */} + {/* 프로젝트 카드 목록 (스크롤 영역) */}
- {orderedTasks.length === 0 ? ( -
- 해당 업무 없음 -
- ) : (() => { + {(() => { const projectTasks = orderedTasks.filter((t) => t.taskType !== '상시업무'); - const routineTasks = orderedTasks.filter((t) => t.taskType === '상시업무'); - return ( + return projectTasks.length === 0 ? ( +
+ 해당 업무 없음 +
+ ) : ( - t.id)} strategy={verticalListSortingStrategy}> + t.id)} strategy={verticalListSortingStrategy}> {projectTasks.map((task) => ( ))} - {routineTasks.length > 0 && ( - <> -
-
- 상시업무 -
-
- {routineTasks.map((task) => ( - - ))} - - )} ); })()}
+ + {/* 관리현황 고정 영역 (하단 2칸) */} + {(() => { + const routineTasks = orderedTasks.filter((t) => t.taskType === '상시업무'); + return ( +
+
+
+ 관리현황 +
+
+
+ {routineTasks.length === 0 ? ( +
+ 관리현황 없음 +
+ ) : ( + + t.id)} strategy={verticalListSortingStrategy}> + {routineTasks.map((task) => ( + + ))} + + + )} +
+
+ ); + })()}
{/* 컨텍스트 메뉴 */} diff --git a/frontend/src/components/dashboard/TaskCard.tsx b/frontend/src/components/dashboard/TaskCard.tsx index 67f5d3a..8019125 100644 --- a/frontend/src/components/dashboard/TaskCard.tsx +++ b/frontend/src/components/dashboard/TaskCard.tsx @@ -189,15 +189,8 @@ export function TaskCard({
- {/* ── description ── */} - {task.description && ( -
- {task.description} -
- )} - {/* ── 기간 + 상태 ── */} -
+
{(task.startDate || task.dueDate) ? `${task.startDate ? fmtDate(task.startDate) : '?'} ~ ${task.dueDate ? fmtDate(task.dueDate) : '?'}` @@ -208,10 +201,17 @@ export function TaskCard({
+ {/* ── description ── */} + {task.description && ( +
+ {task.description} +
+ )} + {/* ── 이슈 메모 ── */} {task.issueNote && ( -
- ▶ 이슈 : +
+ {task.issueNote}
)}