From 3b914fbc2e675fcad52c3079c2b45b00aabe37ea Mon Sep 17 00:00:00 2001 From: bicochan Date: Mon, 28 Sep 2026 15:21:19 +0900 Subject: [PATCH] =?UTF-8?q?[as]=20feat:=20=EB=B3=B4=EC=99=84=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81=20(20260928?= =?UTF-8?q?=5F1521)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/design-cnstn/model/columns.tsx | 13 +++- .../src/pages/fnrs-cnsltn/model/columns.tsx | 13 +++- .../as/src/pages/instl-sncn/model/columns.tsx | 13 +++- .../pages/sewer-bsc-plan/model/columns.tsx | 13 +++- .../ui/sewer-bsc-plan-form-page.tsx | 2 +- .../ui/attachments-form-section.tsx | 62 +++++++++---------- 6 files changed, 78 insertions(+), 38 deletions(-) diff --git a/apps/as/src/pages/design-cnstn/model/columns.tsx b/apps/as/src/pages/design-cnstn/model/columns.tsx index 429c209aa..93a453314 100644 --- a/apps/as/src/pages/design-cnstn/model/columns.tsx +++ b/apps/as/src/pages/design-cnstn/model/columns.tsx @@ -61,6 +61,13 @@ function buildProgressBadges(prgrsSttsComCd: string): ProgressBadge[] { ]; } +function getProgressStatusBadge(prgrsSttsComCd?: string | null) { + if (prgrsSttsComCd === "SL") { + return 보완요청; + } + return null; +} + function getBadgeColor(state: BadgeState) { switch (state) { case "completed": @@ -110,7 +117,11 @@ export function createDesignCnstnColumns() { columnHelper.accessor("bizNm", { header: "사업명", meta: { align: "left" }, - cell: ({ getValue }) => formatOptional(getValue()), + cell: ({ row, getValue }) => ( + <> + {getProgressStatusBadge(row.original.prgrsSttsComCd)} {formatOptional(getValue())} + + ), }), columnHelper.accessor("taskSeCdNm", { header: "업무구분", diff --git a/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx b/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx index d033b290e..b6c4b24be 100644 --- a/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx @@ -102,6 +102,13 @@ function buildProgressBadges(prgrsSttsComCd: string, techRplyHstryYn: "Y" | "N") ]; } +function getProgressStatusBadge(prgrsSttsComCd?: string | null) { + if (prgrsSttsComCd === "SL") { + return 보완요청; + } + return null; +} + function getBadgeColor(state: BadgeState) { switch (state) { case "completed": @@ -152,7 +159,11 @@ export function createFnrsCnsltnColumns() { columnHelper.accessor("bizNm", { header: "사업명", meta: { align: "left" }, - cell: ({ getValue }) => formatOptional(getValue()), + cell: ({ row, getValue }) => ( + <> + {getProgressStatusBadge(row.original.prgrsSttsComCd)} {formatOptional(getValue())} + + ), }), columnHelper.accessor("taskSeCdNm", { header: "업무구분", diff --git a/apps/as/src/pages/instl-sncn/model/columns.tsx b/apps/as/src/pages/instl-sncn/model/columns.tsx index f00d05720..8dc617efa 100644 --- a/apps/as/src/pages/instl-sncn/model/columns.tsx +++ b/apps/as/src/pages/instl-sncn/model/columns.tsx @@ -103,6 +103,13 @@ function buildProgressBadges(prgrsSttsComCd: string, techRplyHstryYn: "Y" | "N") ]; } +function getProgressStatusBadge(prgrsSttsComCd?: string | null) { + if (prgrsSttsComCd === "SL") { + return 보완요청; + } + return null; +} + function getBadgeColor(state: BadgeState) { switch (state) { case "completed": @@ -153,7 +160,11 @@ export function createInstlSncnColumns() { columnHelper.accessor("bizNm", { header: "사업명", meta: { align: "left" }, - cell: ({ getValue }) => formatOptional(getValue()), + cell: ({ row, getValue }) => ( + <> + {getProgressStatusBadge(row.original.prgrsSttsComCd)} {formatOptional(getValue())} + + ), }), columnHelper.accessor("taskSeCdNm", { header: "업무구분", diff --git a/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx b/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx index e75312b0b..d0bc4e32c 100644 --- a/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx +++ b/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx @@ -101,6 +101,13 @@ function buildProgressBadges(prgrsSttsComCd: string, techRplyHstryYn: "Y" | "N") ]; } +function getProgressStatusBadge(prgrsSttsComCd?: string | null) { + if (prgrsSttsComCd === "SL") { + return 보완요청; + } + return null; +} + function getBadgeColor(state: BadgeState) { switch (state) { case "completed": @@ -151,7 +158,11 @@ export function createSewerBscPlanColumns() { columnHelper.accessor("sewerBscPlanNm", { header: "기본계획명", meta: { align: "left" }, - cell: ({ getValue }) => formatOptional(getValue()), + cell: ({ row, getValue }) => ( + <> + {getProgressStatusBadge(row.original.prgrsSttsComCd)} {formatOptional(getValue())} + + ), }), columnHelper.accessor("sewerBscPlanSeCdNm", { header: "계획구분", diff --git a/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-form-page.tsx b/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-form-page.tsx index 8c05521c3..7aed131ef 100644 --- a/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-form-page.tsx +++ b/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-form-page.tsx @@ -240,7 +240,7 @@ function SewerBscPlanFormPage({ return ( -
+
diff --git a/apps/as/src/widgets/pbadms-sprt/ui/attachments-form-section.tsx b/apps/as/src/widgets/pbadms-sprt/ui/attachments-form-section.tsx index 064691f14..b69640568 100644 --- a/apps/as/src/widgets/pbadms-sprt/ui/attachments-form-section.tsx +++ b/apps/as/src/widgets/pbadms-sprt/ui/attachments-form-section.tsx @@ -15,7 +15,11 @@ import { SectionCollapsible, UploadedFileChip, } from "@/shared/ui"; -import { attachService, useDownloadAttachmentByAtflCd, useDownloadAttachmentByAtflId } from "@/entities/attach"; +import { + attachService, + useDownloadAttachmentByAtflCd, + useDownloadAttachmentByAtflId, +} from "@/entities/attach"; import { useEsntlAtchFileMngTree } from "@/entities/esntl"; import { Button, @@ -373,32 +377,26 @@ function AttachmentsFormSection({ return (
-
-

필수 첨부파일

- - - - - - - - - - 파일명 - - 파일 확장자 - 파일첨부 - - - - {essentialFiles.length === 0 ? ( + {essentialFiles.length === 0 && ( +
+

필수 첨부파일

+
+ + + + + + - - 조회된 필수 첨부파일 항목이 없습니다. - + + 파일명 + + 파일 확장자 + 파일첨부 - ) : ( - essentialFiles.map((file) => { + + + {essentialFiles.map((file) => { const atflCd = file.atchFileGroupId ?? ""; return ( @@ -445,11 +443,11 @@ function AttachmentsFormSection({ ); - }) - )} - -
-
+ })} + + +
+ )}
@@ -468,9 +466,7 @@ function AttachmentsFormSection({ fileName={item.file?.name ?? item.fileName} isUploading={isUploading[item.fileKey] ?? false} onRemove={() => void removeEtcFile(idx)} - onDownload={ - item.atflId ? () => downloadByAtflId(item.atflId!) : undefined - } + onDownload={item.atflId ? () => downloadByAtflId(item.atflId!) : undefined} /> ))}