diff --git a/src/app/(pages)/(main)/performance/page.tsx b/src/app/(pages)/(main)/performance/page.tsx index 5d76404..d523384 100644 --- a/src/app/(pages)/(main)/performance/page.tsx +++ b/src/app/(pages)/(main)/performance/page.tsx @@ -90,14 +90,14 @@ const monitoringAddOptions: Code[] = [ codeGroup: "monitoring_add", codeValue: 0, codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd, - codeLabel: "추가 모니터링 X", + codeLabel: "추가 X", memo: "", }, { codeGroup: "monitoring_add", codeValue: 1, codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd, - codeLabel: "추가 모니터링 O", + codeLabel: "추가 O", memo: "", }, ]; @@ -353,10 +353,13 @@ const PerformancePage = () => { cell: ({row}) => row.original.performanceDetail["performanceNo"] ?? "", }, {accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id}, - {accessorKey: "monitoringAdd", header: PERFORMANCE_FIELD_LABELS.monitoringAdd, - accessorFn: (row) => row.id % 100 !== 1? "추가" : "", - cell: ({row}) => row.original.id % 100 !== 1? "추가" : "", - }, + ...(!isWrittenReviewer ? [ + {accessorKey: "monitoringAdd", header: PERFORMANCE_FIELD_LABELS.monitoringAdd, + accessorFn: (row) => row.id % 100 !== 1? "추가" : "", + cell: ({row}) => row.original.id % 100 !== 1? "추가" : "", + enableSorting: false + }, + ]: []) as DataTableColumn[], {id: "businessType", header: PERFORMANCE_FIELD_LABELS.businessType, cell: ({row}) => getCodeLabel(codes, "business_type", row.original.businessType)}, {id: "genre", header: PERFORMANCE_FIELD_LABELS.performanceGenre, cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)}, {id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, @@ -383,7 +386,7 @@ const PerformancePage = () => { ]: []) as DataTableColumn[], { id: "localReview", - header: "지자체 평가", + header: "자체 보고서", cell: ({row}) => { if(row.original.id % 100 !== 1){ return "-"; @@ -473,7 +476,7 @@ const PerformancePage = () => { {!isWrittenReviewer && ( updateFilters((prev) => ({...prev, monitoringAdd: value}))} options={monitoringAddOptions} placeholder={PERFORMANCE_FIELD_LABELS.monitoringAdd} /> )} - updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="지자체 평가 상태" /> + updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="자체 보고서 상태" /> updateFilters((prev) => ({...prev, monitoring1Status: value}))} options={monitoringStatusOptions} placeholder="모니터링1 상태" /> updateFilters((prev) => ({...prev, monitoring2Status: value}))} options={monitoringStatusOptions} placeholder="모니터링2 상태" /> updateFilters((prev) => ({...prev, writtenReviewStatus: value}))} options={writtenReviewStatusOptions} placeholder="서면평가 상태" /> diff --git a/src/components/data-table/DataTable.tsx b/src/components/data-table/DataTable.tsx index 5d0ec55..bfc0eee 100644 --- a/src/components/data-table/DataTable.tsx +++ b/src/components/data-table/DataTable.tsx @@ -244,7 +244,7 @@ export function DataTable({ onClick={drag.wrapClick(() => handleRowClick(row))} className={cn( cellFontClass, - '[&>td]:py-3 [&>td]:px-3', + '[&>td]:py-2 [&>td]:px-2', selectMode !== 'none' && 'cursor-pointer', 'data-[state=selected]:bg-slate-100 data-[state=selected]:font-semibold', shouldHighlight && 'bg-emerald-50', diff --git a/src/components/dialog/MonitoringPerformanceDetailDialog.tsx b/src/components/dialog/MonitoringPerformanceDetailDialog.tsx index 1b3252f..05a6e7f 100644 --- a/src/components/dialog/MonitoringPerformanceDetailDialog.tsx +++ b/src/components/dialog/MonitoringPerformanceDetailDialog.tsx @@ -215,7 +215,6 @@ export function MonitoringPerformanceDetailDialog({ {getCodeLabel(codes, "business_type", performance.businessType)} {getCodeLabel(codes, "genre", performance.performanceGenre)} {getCodeLabel(codes, "area", performance.performanceArea)} - {performance.performanceDetail["performanceAreaDetail"] ?? ""} {performance.artistName} {performance.performanceName} {performance.performanceStartMonth}월 diff --git a/src/components/dialog/PerformanceDetailDialog.tsx b/src/components/dialog/PerformanceDetailDialog.tsx index cf2ee04..2879adb 100644 --- a/src/components/dialog/PerformanceDetailDialog.tsx +++ b/src/components/dialog/PerformanceDetailDialog.tsx @@ -237,7 +237,7 @@ function LocalGovernmentReviewRow({ return (
-
지자체
+
자체 보고서
{display.label} { - downloadFromUrl(`/api/review/template/download/${reviewType}`); + const downloadTemplate = (reviewType: number, classification: number) => { + downloadFromUrl(`/api/review/template/download/${reviewType}/${classification}`); }; return ( @@ -506,7 +506,11 @@ export function PerformanceDetailDialog({ {draft.id % 100 !== 1? "추가" : ""} {getCodeLabel(codes, "business_type", draft.businessType)} {getCodeLabel(codes, "genre", draft.performanceGenre)} - {getCodeLabel(codes, "area", draft.performanceArea)} + + {isEditing ? ( + updateDraft("performanceArea", Number(value))} options={codes.area ?? []} placeholder={PERFORMANCE_FIELD_LABELS.performanceArea} /> + ) : getCodeLabel(codes, "area", draft.performanceArea)} + {isEditing ? updateDetail("performanceAreaDetail", event.target.value)} /> : draft.performanceDetail["performanceAreaDetail"] ?? ""} {draft.artistName} {isEditing ? updateDraft("performanceName", event.target.value)} /> : draft.performanceName} @@ -563,14 +567,10 @@ export function PerformanceDetailDialog({
평가 및 모니터링 현황
- -
diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index af666fb..306e02c 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -48,9 +48,9 @@ const MainLayout = ({ children }: MainLayoutProps) => { /> {/* 본문 */} -
+
{/* 메인 콘텐츠만 가변 높이 적용 */} -
+
{children}
diff --git a/src/lib/gwcf/field-labels.ts b/src/lib/gwcf/field-labels.ts index 33d5749..05fc523 100644 --- a/src/lib/gwcf/field-labels.ts +++ b/src/lib/gwcf/field-labels.ts @@ -18,7 +18,7 @@ export const USER_FIELD_LABELS = { export const PERFORMANCE_FIELD_LABELS = { no: "No.", id: "연번", - monitoringAdd: "추가 모니터링", + monitoringAdd: "분류", businessType: "사업유형", performanceGenre: "분야(장르)", performanceArea: "지역",