diff --git a/apps/as/src/pages/design-cnstn/ui/sections/tech-review-opinion-section.tsx b/apps/as/src/pages/design-cnstn/ui/sections/tech-review-opinion-section.tsx index f63db2fbe..93a86c89c 100644 --- a/apps/as/src/pages/design-cnstn/ui/sections/tech-review-opinion-section.tsx +++ b/apps/as/src/pages/design-cnstn/ui/sections/tech-review-opinion-section.tsx @@ -50,7 +50,6 @@ export interface TechReviewOpinionSectionHandle { interface TechReviewOpinionTableProps { items: DesignCnstnRvwOpnnResponseDto[]; - isReviewTurn: boolean; } interface UploadedOpinionFile { @@ -296,7 +295,7 @@ const TechReviewOpinionSection = forwardRef<
{kecoRvwList.length > 0 ? ( - + ) : null} {renderOpinionForm("KECO")}
@@ -311,7 +310,7 @@ function getRvwOpnnIds(item: DesignCnstnRvwOpnnResponseDto) { return [item.designCnstnDocNo, item.rvwOpnnSn] as const; } -function TechReviewOpinionTable({ items, isReviewTurn }: TechReviewOpinionTableProps) { +function TechReviewOpinionTable({ items }: TechReviewOpinionTableProps) { const queryClient = useQueryClient(); const currentUserUuid = useUserStore((state) => state.userInfo?.userUnqId); @@ -320,7 +319,6 @@ function TechReviewOpinionTable({ items, isReviewTurn }: TechReviewOpinionTableP items={items} getRowKey={(item) => `${item.designCnstnDocNo}_${item.rvwOpnnSn}`} currentUserUuid={currentUserUuid} - isReviewTurn={isReviewTurn} onUpdate={async (item, body) => { await designCnstnRvwOpnnService.update(...getRvwOpnnIds(item), body); await queryClient.invalidateQueries({ queryKey: designCnstnKeys.all }); diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/sections/tech-review-opinion-section.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/sections/tech-review-opinion-section.tsx index 999519e30..1b61b4b67 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/sections/tech-review-opinion-section.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/sections/tech-review-opinion-section.tsx @@ -48,7 +48,6 @@ export interface TechReviewOpinionSectionHandle { interface TechReviewOpinionTableProps { items: FnrsCnsltnRvwOpnnResponseDto[]; - isReviewTurn: boolean; } interface UploadedOpinionFile { @@ -292,7 +291,7 @@ const TechReviewOpinionSection = forwardRef<
{envRvwList.length > 0 ? ( - + ) : null} {renderOpinionForm("ENV")}
@@ -302,7 +301,7 @@ const TechReviewOpinionSection = forwardRef<
{kecoRvwList.length > 0 ? ( - + ) : null} {/* 재원협의에서 환경공단 검토의견은 자동 생성 @@ -322,7 +321,7 @@ function getRvwOpnnIds(item: FnrsCnsltnRvwOpnnResponseDto) { return [item.fnrsCnsltnDocNo, item.rvwOpnnSn] as const; } -function TechReviewOpinionTable({ items, isReviewTurn }: TechReviewOpinionTableProps) { +function TechReviewOpinionTable({ items }: TechReviewOpinionTableProps) { const queryClient = useQueryClient(); const currentUserUuid = useUserStore((state) => state.userInfo?.userUnqId); @@ -331,7 +330,6 @@ function TechReviewOpinionTable({ items, isReviewTurn }: TechReviewOpinionTableP items={items} getRowKey={(item) => `${item.fnrsCnsltnDocNo}_${item.rvwOpnnSn}`} currentUserUuid={currentUserUuid} - isReviewTurn={isReviewTurn} onUpdate={async (item, body) => { await fnrsCnsltnRvwOpnnService.update(...getRvwOpnnIds(item), body); await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all }); diff --git a/apps/as/src/pages/instl-sncn/lib/button-config.ts b/apps/as/src/pages/instl-sncn/lib/button-config.ts index 8dafefd31..b19609a06 100644 --- a/apps/as/src/pages/instl-sncn/lib/button-config.ts +++ b/apps/as/src/pages/instl-sncn/lib/button-config.ts @@ -3,7 +3,6 @@ export const INSTL_SNCN_VIEW_BUTTON_ACTION = { aply: "aply", del: "del", instlSncnAncmnt: "instlSncnAncmnt", - envoSbmsn: "envoSbmsn", rjct: "rjct", sncnAprv: "sncnAprv", rvwRply: "rvwRply", @@ -33,14 +32,16 @@ const ROLE_STATUS_BUTTON_ACTIONS: Record = { LOCAL: "자가체크", - ENV: "환경청검토", + ENV: "광역자치단체검토", KECO: "기술검토", }; export const REVIEW_STEP_LABELS: Record = { LOCAL: "지자체", - ENV: "환경청", + ENV: "광역자치단체", KECO: "환경공단", }; @@ -89,7 +89,7 @@ export const INSTL_PROGRESS_ORDER = [ export const ROLE_TO_REVIEW_STEP: Record = { ROLE_USER05: "LOCAL", - ROLE_USER03: "ENV", + ROLE_USER04: "ENV", ROLE_USER01: "KECO", }; diff --git a/apps/as/src/pages/instl-sncn/ui/components/floating-action-buttons.tsx b/apps/as/src/pages/instl-sncn/ui/components/floating-action-buttons.tsx index 4ae4fd4e3..a34c23292 100644 --- a/apps/as/src/pages/instl-sncn/ui/components/floating-action-buttons.tsx +++ b/apps/as/src/pages/instl-sncn/ui/components/floating-action-buttons.tsx @@ -35,7 +35,6 @@ import { type InstlSncnViewButtonAction, needsRoleUser01AtrzResolve, } from "../../lib/button-config"; -import { computeReviewStepChecklistProgress } from "../../lib/checklist-utils"; import { buildSavePayload, buildSupplementReqPayload, @@ -179,11 +178,6 @@ function FloatingActionButtons({ } async function handleAplyClick() { - const { percent } = computeReviewStepChecklistProgress( - data.cklstResultList ?? [], - checklistFormState.results, - "LOCAL", - ); const payload: InstlSncnApplySaveRequestDto = buildSavePayload( data, checklistFormState, @@ -191,11 +185,6 @@ function FloatingActionButtons({ "ST", ); - if (percent !== 100) { - alert("모든 체크리스트 항목을 체크해야 신청이 가능합니다."); - return; - } - await executeAction({ action: INSTL_SNCN_VIEW_BUTTON_ACTION.aply, request: payload, @@ -231,22 +220,6 @@ function FloatingActionButtons({ }); } - async function handleEnvoSbmsnClick() { - const payload: DocPrgrsUpdateRequestDto = { - docNo, - docSeComCd, - prgrsSttsComCd: "LE", - }; - await executeAction({ - action: INSTL_SNCN_VIEW_BUTTON_ACTION.envoSbmsn, - request: payload, - successMessage: "제출되었습니다.", - }); - queryClient.invalidateQueries({ - queryKey: instlSncnKeys.list(), - }); - } - async function handleRjctClick() { const payload: DocPrgrsUpdateRequestDto = { docNo, @@ -284,16 +257,6 @@ function FloatingActionButtons({ } async function handleRvwRplyClick() { - const { percent } = computeReviewStepChecklistProgress( - data.cklstResultList ?? [], - checklistFormState.results, - "ENV", - ); - - if (percent !== 100) { - alert("모든 체크리스트 항목을 체크해야 검토결과 회신이 가능합니다."); - return; - } const payload = buildTechReviewReplyPayload( data, @@ -369,16 +332,6 @@ function FloatingActionButtons({ } async function handleRvwCmptnClick() { - const { percent } = computeReviewStepChecklistProgress( - data.cklstResultList ?? [], - checklistFormState.results, - "KECO", - ); - - if (percent !== 100) { - alert("모든 체크리스트 항목을 체크해야 검토완료가 가능합니다."); - return; - } const payload = { ...buildTechReviewReplyPayload( @@ -447,11 +400,6 @@ function FloatingActionButtons({ 설치인가 고시 )} - {shouldShowButton(INSTL_SNCN_VIEW_BUTTON_ACTION.envoSbmsn) && ( - - )} {shouldShowButton(INSTL_SNCN_VIEW_BUTTON_ACTION.rjct) && (