From 5e54039028393c4b58e62a60ce9288a7da2e15b2 Mon Sep 17 00:00:00 2001 From: bicochan Date: Tue, 15 Sep 2026 16:42:21 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[as]=20feat:=20=EC=8B=A4=EB=AC=B4=ED=98=91?= =?UTF-8?q?=EC=9D=98=EC=84=9C=20=EA=B2=80=ED=86=A0=EC=9E=90=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95(EV)=20=EB=A1=9C=EC=A7=81=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/as/docs/pwrk-cnsltn/development-guide.md | 71 +++++----- apps/as/docs/pwrk-cnsltn/ref-endpoint.md | 10 +- .../docs/pwrk-cnsltn/ref-frontend-entities.md | 5 +- .../as/docs/pwrk-cnsltn/ref-process-status.md | 26 ++-- .../as/docs/pwrk-cnsltn/ref-screen-buttons.md | 8 +- .../entities/elapr/api/elapr-dmnd-service.ts | 6 +- apps/as/src/entities/elapr/api/queries.ts | 21 ++- apps/as/src/entities/elapr/index.ts | 5 + .../elapr/lib/doc-prgrs-to-apln-rows.ts | 21 +++ .../src/entities/elapr/lib/use-apln-rows.ts | 14 +- .../elapr/model/elapr-dmnd-interface.ts | 2 +- .../elapr/ui/elapr-apln-picker-grid.tsx | 33 +++-- .../ui/elapr-doc-prgrs-picker-dialog.tsx | 129 ++++++++++++++++++ .../elapr/ui/elapr-doc-prgrs-status.tsx | 84 +++++++++--- .../pages/fnrs-cnsltn/lib/button-config.ts | 10 +- .../ui/components/floating-action-buttons.tsx | 54 ++++++-- apps/as/src/shared/model/pbadms-sprt.ts | 1 + 17 files changed, 385 insertions(+), 115 deletions(-) create mode 100644 apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts create mode 100644 apps/as/src/entities/elapr/ui/elapr-doc-prgrs-picker-dialog.tsx diff --git a/apps/as/docs/pwrk-cnsltn/development-guide.md b/apps/as/docs/pwrk-cnsltn/development-guide.md index 6812c3db1..08193cd83 100644 --- a/apps/as/docs/pwrk-cnsltn/development-guide.md +++ b/apps/as/docs/pwrk-cnsltn/development-guide.md @@ -10,7 +10,7 @@ > > - 프로세스·상태·버튼: `03.재원협의_실무협의_프로세스_통합_v완결.md` > - REST 설계: `05.재원협의_상태별_endpoint_설계.md` -> - 공통코드: `FNRSSTTS` (`SV, ST, LE, FV, ER, SL, AC, TE, TP, RM, RB, RC, RA, AV, RK, RR, EP, TA`) +> - 공통코드: `FNRSSTTS` (`SV, ST, LE, FV, ER, SL, AC, TE, TP, RM, RB, RC, RA, AV, EV, RK, RR, EP, TA`) > > **백엔드 서비스**: > @@ -40,7 +40,7 @@ v1.0은 공단 접수자의 **자료검증 → 초안생성 → 웹기안기** | [ref-screen-buttons.md](./ref-screen-buttons.md) | 38행 화면·역할·버튼 매트릭스, 버튼 가시성 | `button-config.ts` 개편 | | [ref-endpoint.md](./ref-endpoint.md) | 버튼→API 총괄, 단계별 입출력, FE 호출 금지 API, Gap Analysis | 엔티티·service 매핑 | | [ref-frontend-entities.md](./ref-frontend-entities.md) | ENDPOINT, 슬라이스, Service 시그니처, 폴링, 웹기안기, DTO | 엔티티 레이어 구현 | -| [ref-webhwp-api.md](./ref-webhwp-api.md) | 웹한글기안기 v3 `HwpCtrl` Properties/Methods, Open/SaveAs | 기안기 위젯 연동 | +| [ref-webhwp-api.md](./ref-webhwp-api.md) | 웹한글기안기 v3 `HwpCtrl` Properties/Methods, Open/SaveAs | 기안기 위젯 연동 | --- @@ -98,7 +98,7 @@ v1.0은 공단 접수자의 **자료검증 → 초안생성 → 웹기안기** 정방향: ``` -SV → ST → LE → FV → ER → AC → TE → TP → RM → RB → RC → RA → AV → RK → RR → EP → TA +SV → ST → LE → FV → ER → AC → TE → TP → RM → RB → RC → RA → AV → EV → RK → RR → EP → TA ``` 자체종결: `LE → EP → TA` @@ -119,7 +119,8 @@ SV → ST → LE → FV → ER → AC → TE → TP → RM → RB → RC → RA | `RB` | 지자체회신 | 기초 실무협의서 관리 / 조치완료 | | `RC` | 조치결과서 제출 | 광역 → 환경청 `RA` | | `RA` | 조치결과서제출(환경청) | 환경청 2차 의뢰 `AV` | -| `AV` | 금액검증 | AI 진행 표시. **30분** 후 `RK` Fallback | +| `AV` | 금액검증 | AI 진행 표시. **30분** 후 `EV` Fallback | +| `EV` | 조치결과검토의뢰 | 공단 접수자: 2차 결재선 검토자지정 → `RK` | | `RK` | 조치결과서검토 | 웹기안기·금액검증 재실행·보완. 결재선 2차 | | `RR` | 조치결과서검토 회신 | 환경청 → 광역 `EP` | | `EP` | 검토결과 회신 | 광역 → 기초 `TA` | @@ -144,7 +145,7 @@ SV → ST → LE → FV → ER → AC → TE → TP → RM → RB → RC → RA 6. **진행상태만 바꾸는 버튼은** `POST /fnrs-cnsltn-mng/doc/updatePrgrsStts`**를 재사용한다.** (`ST→LE`, `RM→RB`, `RC→RA`, `RR→EP`, `EP→TA`) 7. **보완요청/보완완료는 공통 API** `reqsupplement` / `submitsupplement`. 복귀 상태(`ER`/`TE`/`RK`)는 서버가 이력에서 결정한다. 프론트는 직전 상태를 추측해 보내지 않는다. 8. **결재 승인/회신은** `PUT /elapr-prgrs-stts/{id}/process` **하나**. 1차 최종승인자 → `TP`, 2차 → `RR`은 서버가 Feign으로 처리한다. -9. **2차 결재선 복사는 백엔드**. `POST /elapr-apln/copy-line`은 `AV→RK` 콜백에서 호출한다. 프론트는 `RK`에서 2차 결재선을 **조회·표시**만 한다. +9. **2차 결재선은 EV에서 수동 검토자지정**. `POST /elapr-dmnd` (`elaprCycl: 2`, `docPrgrsSttsComCd: RK`). 1차 결재선 자동 copy-line은 사용하지 않는다. 10. **웹기안기는 `webhwp/open` 응답을 axios `blob`으로 조회한 뒤 `File`로 감싸 `HwpCtrl.Open`에 전달한다.** `blob:` Object URL과 `orgnlOtptDocCn`은 쓰지 않는다. --- @@ -189,6 +190,7 @@ BEGIN ON [파일보완] (ER, ATRZ01) → GET file-vrfc-results → 팝업 → reqsupplement ON [파일검증] (ER, ATRZ01) → dcrag-to transfer (상태 유지) ON [검토자지정] (ER, ATRZ01) → POST elapr-dmnd (docPrgrsSttsComCd: AC) → START POLL AC + ON [검토자지정] (EV, ATRZ01) → POST elapr-dmnd (elaprCycl: 2, docPrgrsSttsComCd: RK) ON [실무협의서관리] (TE|RK) → GET webhwp/open (blob) → HwpCtrl.Open(File) ON [실무협의서생성] (TE, 실패/타임아웃) → dcrag-to draft/generate ON [검토결과조회] (TE) → pwrk-cnsltn-mng findById | findByUpDocNo @@ -212,36 +214,37 @@ END 프론트가 치는 것만. 콜백·스케줄러는 제외. -| 주체 | 버튼 | From → To | Method & URI | -| --------- | -------------------------- | ----------------------------- | --------------------------------------------------------------- | --- | ------------------------------------------------ | -| 기초 | 저장 / 신청완료 | →`SV` / `SV→ST` | `POST /fnrs-cnsltn-mng/save-apply` | -| 기초 | 삭제 | `SV` | `DELETE /fnrs-cnsltn-mng/{docNo}` | -| 광역 | 환경청제출 | `ST→LE` | `POST /fnrs-cnsltn-mng/doc/updatePrgrsStts` | -| 환경청 | 결과회신(자체종결) | `LE→EP` | `POST /fnrs-cnsltn-mng/{docNo}/tech-review` | -| 환경청 | 기술검토 의뢰 | `LE→FV` | **신규** `POST /fnrs-cnsltn-mng/{docNo}/request-examine` | -| 공단 접수 | 파일보완 팝업 | `ER` | `GET /fnrs-cnsltn-mng/{docNo}/file-vrfc-results` | -| 공단 접수 | 파일보완요청 | `ER→SL` | `POST /fnrs-cnsltn-mng/{docNo}/reqsupplement` | -| 공단 접수 | 파일검증 재실행 | `ER` 유지 | `POST /dcrag-to/documents/transfer` | -| 공단 접수 | 검토자지정 | `ER→AC` | `POST /elapr-dmnd` | -| 공단 검토 | 실무협의서관리 | `TE`/`RK` | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | -| 공단 검토 | 실무협의서생성 | `TE` 유지 | `POST /dcrag-to/documents/draft/generate` | -| 공단 검토 | 저장 | `TE`/`RK` | `POST /pwrk-cnsltn-mng/save-apply` | -| 공단 | 검토완료 / 결재(승인·회신) | `TE` 유지 / `TE→TP` / `RK→RR` | `PUT /elapr-prgrs-stts/{id}/process` | -| 공단 검토 | 보완요청 | `TE→SL` / `RK→SL` | `POST /fnrs-cnsltn-mng/{docNo}/reqsupplement` | -| 기초 | 파일보완완료 / 보완완료 | `SL→ER | TE | RK` | `POST /fnrs-cnsltn-mng/{docNo}/submitsupplement` | -| 환경청 | 재원협의 결과 회신 | `TP→RM` | `POST /fnrs-cnsltn-mng/{docNo}/tech-review` | -| 광역 | 지자체회신 | `RM→RB` | `updatePrgrsStts` | -| 기초 | 실무협의서 관리 | `RB` 유지 | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | +| 주체 | 버튼 | From → To | Method & URI | +| --------- | -------------------------- | ----------------------------- | ---------------------------------------------------------------------------------- | +| 기초 | 저장 / 신청완료 | →`SV` / `SV→ST` | `POST /fnrs-cnsltn-mng/save-apply` | +| 기초 | 삭제 | `SV` | `DELETE /fnrs-cnsltn-mng/{docNo}` | +| 광역 | 환경청제출 | `ST→LE` | `POST /fnrs-cnsltn-mng/doc/updatePrgrsStts` | +| 환경청 | 결과회신(자체종결) | `LE→EP` | `POST /fnrs-cnsltn-mng/{docNo}/tech-review` | +| 환경청 | 기술검토 의뢰 | `LE→FV` | **신규** `POST /fnrs-cnsltn-mng/{docNo}/request-examine` | +| 공단 접수 | 파일보완 팝업 | `ER` | `GET /fnrs-cnsltn-mng/{docNo}/file-vrfc-results` | +| 공단 접수 | 파일보완요청 | `ER→SL` | `POST /fnrs-cnsltn-mng/{docNo}/reqsupplement` | +| 공단 접수 | 파일검증 재실행 | `ER` 유지 | `POST /dcrag-to/documents/transfer` | +| 공단 접수 | 검토자지정 | `ER→AC` | `POST /elapr-dmnd` (`elaprCycl: 1`) | +| 공단 접수 | 검토자지정 | `EV→RK` | `POST /elapr-dmnd` (`elaprCycl: 2`) | +| 공단 검토 | 실무협의서관리 | `TE`/`RK` | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | +| 공단 검토 | 실무협의서생성 | `TE` 유지 | `POST /dcrag-to/documents/draft/generate` | +| 공단 검토 | 저장 | `TE`/`RK` | `POST /pwrk-cnsltn-mng/save-apply` | +| 공단 | 검토완료 / 결재(승인·회신) | `TE` 유지 / `TE→TP` / `RK→RR` | `PUT /elapr-prgrs-stts/{id}/process` | +| 공단 검토 | 보완요청 | `TE→SL` / `RK→SL` | `POST /fnrs-cnsltn-mng/{docNo}/reqsupplement` | +| 기초 | 파일보완완료 / 보완완료 | `SL→ER` / `TE` / `RK` | `POST /fnrs-cnsltn-mng/{docNo}/submitsupplement` | +| 환경청 | 재원협의 결과 회신 | `TP→RM` | `POST /fnrs-cnsltn-mng/{docNo}/tech-review` | +| 광역 | 지자체회신 | `RM→RB` | `updatePrgrsStts` | +| 기초 | 실무협의서 관리 | `RB` 유지 | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | | 기초 | 조치완료 | `RB→RA` | **신규** `POST /pwrk-cnsltn-mng/{pwrkDocNo}/submit-actn-result` (`isSubmit: true`) | -| 광역 | 조치결과서제출 | `RC→RA` | `updatePrgrsStts` | -| 환경청 | 실무협의서 관리 | `RA` 유지 (조회) | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | -| 환경청 | 조치결과 검토의뢰 | `RA→AV` | **신규** `POST /fnrs-cnsltn-mng/{docNo}/request-actn-review` | -| 공단 검토 | 금액검증 재실행 | `RK` 유지 | `POST /dcrag-to/documents/cost/verify` | -| 환경청 | 결과회신 | `RR→EP` | `updatePrgrsStts` | -| 광역 | 결과회신 | `EP→TA` | `updatePrgrsStts` | -| 웹기안기 | 저장 | 버전 +1 | `POST /pwrk-cnsltn-doc-crt-rslt` multipart | -| 공통 | 다운로드 | — | `GET /pwrk-cnsltn-doc-crt-rslt/{uuid}/download` | +| 광역 | 조치결과서제출 | `RC→RA` | `updatePrgrsStts` | +| 환경청 | 실무협의서 관리 | `RA` 유지 (조회) | `GET .../pwrk-cnsltn-doc-crt-rslt/{uuid}/webhwp/open` | +| 환경청 | 조치결과 검토의뢰 | `RA→AV` | **신규** `POST /fnrs-cnsltn-mng/{docNo}/request-actn-review` | +| 공단 검토 | 금액검증 재실행 | `RK` 유지 | `POST /dcrag-to/documents/cost/verify` | +| 환경청 | 결과회신 | `RR→EP` | `updatePrgrsStts` | +| 광역 | 결과회신 | `EP→TA` | `updatePrgrsStts` | +| 웹기안기 | 저장 | 버전 +1 | `POST /pwrk-cnsltn-doc-crt-rslt` multipart | +| 공통 | 다운로드 | — | `GET /pwrk-cnsltn-doc-crt-rslt/{uuid}/download` | -신규 4개: `request-examine`, `submit-actn-result`, `request-actn-review`, (백엔드) `elapr-apln/copy-line`. +신규 4개: `request-examine`, `submit-actn-result`, `request-actn-review`, EV 2차 `elapr-dmnd`. --- diff --git a/apps/as/docs/pwrk-cnsltn/ref-endpoint.md b/apps/as/docs/pwrk-cnsltn/ref-endpoint.md index d63d2d4de..712ae57d6 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-endpoint.md +++ b/apps/as/docs/pwrk-cnsltn/ref-endpoint.md @@ -43,7 +43,8 @@ | 27 | 조치완료 | `RB→RA` | as | `POST /api/v1/pwrk-cnsltn-mng/{pwrkDocNo}/submit-actn-result` (`isSubmit=true`) | **신규** | | 28 | 조치결과서제출 | `RC→RA` | as | `updatePrgrsStts` | 기존 | | 29 | 조치결과 검토의뢰 | `RA→AV` | as | `POST /api/v1/fnrs-cnsltn-mng/{docNo}/request-actn-review` | **신규** | -| 30 | 금액검증 콜백 | `AV→RK` | as | `POST /api/v1/dcrag/cost/verify-result` | 서버 | +| 30 | 금액검증 콜백 | `AV→EV` | as | `POST /api/v1/dcrag/cost/verify-result` | 서버 | +| 30a | 검토자지정(2차) | `EV→RK` | elapr | `POST /api/v1/elapr-dmnd` (`elaprCycl=2`) | 기존 | | 31 | 실무협의서관리 | `RK` | as | `GET /pwrk-cnsltn-mng/{pwrkDocNo}` | 기존 | | 32 | 금액검증 재실행 | `RK` | as | `POST /api/v1/dcrag-to/documents/cost/verify` | 기존 | | 33 | 보완요청(금액) | `RK→SL` | as | `reqsupplement` | 기존 | @@ -212,7 +213,7 @@ v1.0 가이드의 “이 API를 프론트가 치면 안 된다”는 **폐기**. - `isSubmit: true` → `RB→RA` (조치완료) 응답: `string` (pwrkDocNo). DTO명 `PwrkActnResultSubmitDto`. -### 3-6. `RA → AV → RK` +### 3-6. `RA → AV → EV → RK` **2차 의뢰 (신규)** — `POST /fnrs-cnsltn-mng/{docNo}/request-actn-review` ```json @@ -223,7 +224,8 @@ v1.0 가이드의 “이 API를 프론트가 치면 안 된다”는 **폐기**. `RA→AV`. 응답: `string` (docNo). DTO명 `EnvoActnReviewReqDto`. `specialRqstCn`만 선택. -금액검증 콜백은 서버. 콜백 후 서버가 `copy-line` 호출. +금액검증 콜백은 서버 → `AV→EV`. +**2차 검토자지정** — `POST /elapr-dmnd` (`elaprCycl: 2`, `docPrgrsSttsComCd: RK`). 1차 결재선(`findDocPrgrsByDocNo`, cycl=1)을 시드로 편집. **금액검증 재실행** — `POST /dcrag-to/documents/cost/verify` @@ -292,7 +294,7 @@ multipart `Content-Type` 헤더를 수동 지정하지 않는다 (boundary). JSO } ``` -`RK`에서 2차 결재선은 기존 `findDocPrgrsByDocNo` / `elaprCycl=2` 조회로 표시. +`RK`에서 결재현황은 `findDocPrgrsByDocNo`(전체) 조회 후 `elaprCycl`로 1차/2차 탭 표시. --- diff --git a/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md b/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md index e63531842..ddb0f5f3d 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md +++ b/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md @@ -343,5 +343,6 @@ docPrgrsSttsComCd: data.detDto?.prgrsSttsComCd, // ER To-Be: -- 검토자지정은 **`ER`에서만**. `elaprCycl: 1`, `docPrgrsSttsComCd: "AC"` -- 2차 결재선은 서버 `copy-line`. `RK`에서 검토자지정 팝업을 다시 열지 않음 +- 검토자지정은 **`ER`(1차)** 과 **`EV`(2차)** 에서. +- `ER`: `elaprCycl: 1`, `docPrgrsSttsComCd: "AC"`, 서식 선택 다이얼로그 +- `EV`: `elaprCycl: 2`, `docPrgrsSttsComCd: "RK"`, 1차 결재선 시드 다이얼로그(서식 없음) diff --git a/apps/as/docs/pwrk-cnsltn/ref-process-status.md b/apps/as/docs/pwrk-cnsltn/ref-process-status.md index e5da682d3..d5d55171b 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-process-status.md +++ b/apps/as/docs/pwrk-cnsltn/ref-process-status.md @@ -16,7 +16,7 @@ 2-Pass: - **Pass 1** 기술 타당성: `SV→ST→LE→FV→ER→AC→TE→TP→RM→RB` -- **Pass 2** 조치결과·금액: `RB→RA→AV→RK→RR→EP→TA` +- **Pass 2** 조치결과·금액: `RB→RA→AV→EV→RK→RR→EP→TA` 자체종결(기술검토 생략): `LE→EP→TA` @@ -80,9 +80,9 @@ sequenceDiagram rect rgb(240, 255, 255) 광역->>환경청: [조치결과서제출] RC → RA 환경청->>AI: [조치결과 검토의뢰] RA → AV - AI-->>공단: 금액검증 콜백 AV → RK - Note over 공단: 30분 미응답 시 RK + 수동 [금액검증] - Note over 공단: AV→RK 시 1차 결재선 → 2차 복사 (서버) + AI-->>공단: 금액검증 콜백 AV → EV + 공단->>공단: [검토자지정] EV → RK + Note over 공단: EV에서 1차 결재선 시드로 2차 결재선 수동 배정 end rect rgb(255, 255, 230) @@ -125,7 +125,8 @@ sequenceDiagram | 9 | 검토결과 회신 | 환경청·광역 | `TP→RM→RB` | 1차 회신. `EP`와 혼동 금지 | | 10 | 조치결과 작성 | 기초 | `RB→RA` | `submit-actn-result` `isSubmit:true` (조치완료) | | 11 | 조치 의뢰 | 환경청 | `RA→AV` | `request-actn-review` | -| 12 | AI 금액검증 | AI·공단 | `AV→RK` | 결재선 복사(서버) | +| 12 | AI 금액검증 | AI·공단 | `AV→EV` | 콜백/Fallback 후 접수자 대기 | +| 12a | 2차 검토자지정 | 공단 접수 | `EV→RK` | `elapr-dmnd` cycl=2 | | 13 | 2차 검토·결재 | 공단 | `RK→RR` / `SL` | 2차 결재선 | | 14 | 최종 회신 | 환경청·광역·기초 | `RR→EP→TA` | 종결 | @@ -151,7 +152,8 @@ sequenceDiagram | `RC` | 조치결과서 제출 | Result Complete | 기초→광역 | `RB→RC` | | `RA` | 조치결과서 제출(환경청) | Result Ask to Basin | 기초→환경청 | `RB→RA` | | `AV` | 금액검증 | Amount Verification | AI | `RA→AV` | -| `RK` | 조치결과서검토 | Result Check | 공단 2차 결재 | `AV→RK`, `SL→RK` | +| `EV` | 조치결과검토의뢰 | Examine Verify | 공단 접수자 | `AV→EV` | +| `RK` | 조치결과서검토 | Result Check | 공단 2차 결재 | `EV→RK`, `SL→RK` | | `RR` | 조치결과서검토 회신 | Result Return to Basin | 공단→환경청 | `RK→RR` | | `EP` | 검토결과 회신 | Examine Pass to Province | 환경청→광역 | `LE→EP`(자체), `RR→EP`(최종) | | `TA` | 검토결과 회신(종료) | Technical Approval | 광역→기초 | `EP→TA` | @@ -200,7 +202,7 @@ stateDiagram-v2 | --- | --- | --- | --- | --- | --- | | AI-1 | 파일 무결성 | `FV→ER` | 환경청 [기술검토 의뢰] | 30분 → `ER` + [파일검증] | `POST /dcrag-to/documents/transfer` | | AI-2 | 초안 생성 | `AC→TE` | 공단 [검토자지정] | 30분 → `TE` + [실무협의서생성] | `POST /dcrag-to/documents/draft/generate` | -| AI-3 | 금액 검증 | `AV→RK` | 환경청 [조치결과 검토의뢰] | 30분 → `RK` + [금액검증] | `POST /dcrag-to/documents/cost/verify` | +| AI-3 | 금액 검증 | `AV→EV` | 환경청 [조치결과 검토의뢰] | 30분 → `EV` + 수동 [금액검증] | `POST /dcrag-to/documents/cost/verify` | - 예상 소요 안내는 **30분** (v1.0의 10분은 폐기). - 콜백 수신·스케줄러 전이는 서버. FE는 상세 refetch / draft status 폴링만. @@ -221,14 +223,12 @@ stateDiagram-v2 --- -## 7. 결재선 복사 - -규칙: `"금액검증후: 2차결재선 1차결재선 복사생성"` +## 7. 2차 결재선 (수동 검토자지정) 1. `TE`에서 1차 결재선(`elaprCycl = 1`) 완료. -2. `AV→RK` 콜백 시 서버가 `POST /elapr-apln/copy-line` (`source=1`, `target=2`). -3. `RK` 화면은 2차 결재선을 조회해 검토자/승인자/최종승인자를 표시. -4. 프론트는 copy-line을 **호출하지 않는다.** +2. 금액검증 콜백/Fallback → `AV→EV`. +3. 공단 접수자가 `EV`에서 [검토자지정]: 1차 결재선을 시드로 편집 후 `POST /elapr-dmnd` (`elaprCycl: 2`) → `RK`. +4. `copy-line` 자동 복사는 사용하지 않는다. 결재 `process`: diff --git a/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md b/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md index a500fad11..1c9d8565d 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md +++ b/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md @@ -62,7 +62,8 @@ API 컬럼은 [ref-endpoint.md](./ref-endpoint.md)와 동일. | 27 | 상세 | USER04 | - | `RC` | 조치결과서제출 | `RA` | 환경청 | `updatePrgrsStts` | | 28 | 상세 | USER03 | - | `RA` | 실무협의서 관리 | 유지 | — | 웹기안기 Open. **저장 불가** | | 28a | 상세 | USER03 | - | `RA` | 조치결과 검토의뢰 | `AV` | 공단 검토 | **`request-actn-review`** | -| 29 | 자동화 | AI | - | `AV` | (금액검증) | `RK` | 공단 검토 | FE 호출 없음. 진행 패널 | +| 29 | 자동화 | AI | - | `AV` | (금액검증) | `EV` | 공단 접수 | FE 호출 없음. 진행 패널 | +| 29a | 상세 | USER01 | 접수자 | `EV` | 검토자지정 | `RK` | 공단 검토 | `POST /elapr-dmnd` cycl=2. 1차 결재선 시드 | | 30 | 상세 | USER01 | 검토자 | `RK` | 실무협의서관리 | 유지 | — | 웹기안기 | | 31 | 상세 | USER01 | 검토자 | `RK` | 금액검증 | `RK` | — | `dcrag-to/cost/verify` | | 32 | 상세 | USER01 | 검토자 | `RK` | 저장 | `RK` | — | `pwrk save-apply` | @@ -85,7 +86,7 @@ API 컬럼은 [ref-endpoint.md](./ref-endpoint.md)와 동일. | --- | --- | --- | | `fileSplmnt` | 파일보완 | `ER` 접수자. 현행에 없음 | | `fileVrfc` | 파일검증 | 유지. `ER` 재실행 | -| `dsgntRvwr` | 검토자지정 | 유지. 전이를 `AC`로 | +| `dsgntRvwr` | 검토자지정 | `ER→AC`(1차), `EV→RK`(2차) | | `pwrkCnsltnDocMng` | 실무협의서관리 | 유지. `TE`·`RK`·`RB`·`RA`(조회 전용) | | `pwrkCnsltnDocCrt` | 실무협의서생성 | 유지. 실패/타임아웃만 | | `rvwRsltInq` | 검토결과조회 | 신규 | @@ -129,6 +130,9 @@ ROLE_USER03 ER / ATRZ01 접수자 → 파일보완, 파일검증, 검토자지정 +EV / ATRZ01 접수자 + → 검토자지정 (2차 결재선. 1차 결재선 시드, 서식 선택 없음) + TE / ATRZ02 검토자 → (초안 성공) 실무협의서관리, 검토결과조회, 저장, 검토완료, 보완요청 → (초안 실패·타임아웃) 실무협의서생성 (+ 위 항목 중 관리/조회는 초안 생긴 뒤) diff --git a/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts b/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts index 368600110..b366afb60 100644 --- a/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts +++ b/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts @@ -49,9 +49,13 @@ async function remove(elaprDmndId: string): Promise { await client.delete(`${BASE}/${elaprDmndId}`); } -async function findDocPrgrsByDocNo(elaprDocNo: string): Promise { +async function findDocPrgrsByDocNo( + elaprDocNo: string, + elaprCycl?: number, +): Promise { const response = await client.get( `${BASE}/sanc/docprgrs/${elaprDocNo}`, + { params: elaprCycl != null ? { elaprCycl } : undefined }, ); return response.data; } diff --git a/apps/as/src/entities/elapr/api/queries.ts b/apps/as/src/entities/elapr/api/queries.ts index 734c6cdf4..19f5fce9b 100644 --- a/apps/as/src/entities/elapr/api/queries.ts +++ b/apps/as/src/entities/elapr/api/queries.ts @@ -185,11 +185,15 @@ export function useElaprDmnd(elaprDmndId: string | null | undefined) { }); } -export function useElaprDocPrgrsByDocNo(elaprDocNo: string | null | undefined) { +export function useElaprDocPrgrsByDocNo( + elaprDocNo: string | null | undefined, + options?: { elaprCycl?: number; enabled?: boolean }, +) { + const elaprCycl = options?.elaprCycl; return useQuery({ - queryKey: [...elaprDmndBaseKey, "findDocPrgrsByDocNo", elaprDocNo], - queryFn: () => elaprDmndService.findDocPrgrsByDocNo(elaprDocNo!), - enabled: Boolean(elaprDocNo), + queryKey: [...elaprDmndBaseKey, "findDocPrgrsByDocNo", elaprDocNo, elaprCycl], + queryFn: () => elaprDmndService.findDocPrgrsByDocNo(elaprDocNo!, elaprCycl), + enabled: Boolean(elaprDocNo) && (options?.enabled ?? true), }); } @@ -284,13 +288,8 @@ export function useProcessElaprPrgrsStts() { const queryClient = useQueryClient(); return useMutation({ - mutationFn: ({ - elaprPrgrsId, - body, - }: { - elaprPrgrsId: string; - body: ElaprProcessRequestDto; - }) => elaprPrgrsSttsService.process(elaprPrgrsId, body), + mutationFn: ({ elaprPrgrsId, body }: { elaprPrgrsId: string; body: ElaprProcessRequestDto }) => + elaprPrgrsSttsService.process(elaprPrgrsId, body), onSuccess: () => { invalidateElaprPrgrsSttsQueries(queryClient); }, diff --git a/apps/as/src/entities/elapr/index.ts b/apps/as/src/entities/elapr/index.ts index 4805fecc3..777245649 100644 --- a/apps/as/src/entities/elapr/index.ts +++ b/apps/as/src/entities/elapr/index.ts @@ -57,6 +57,7 @@ export { buildElaprPrgrsSttsListFromApln, buildElaprPrgrsSttsListFromAplnRows, } from "./lib/dmnd-save-utils"; +export { mapDocPrgrsToAplnRows } from "./lib/doc-prgrs-to-apln-rows"; export type { ElaprPrgrsSttsRow } from "./lib/prgrs-stts-save-utils"; export { assignPrgrsSttsAtrzSeqNumbers, @@ -113,6 +114,10 @@ export type { ReviewerOption } from "./model/reviewer-option"; export { AprvrPickerDialog } from "./ui/aprvr-picker-dialog"; export { ElaprAplnPickerGrid } from "./ui/elapr-apln-picker-grid"; export { ElaprApprovalDialog } from "./ui/elapr-approval-dialog"; +export { + type ElaprDocPrgrsPickerConfirmPayload, + ElaprDocPrgrsPickerDialog, +} from "./ui/elapr-doc-prgrs-picker-dialog"; export { ElaprDocPrgrsStatus } from "./ui/elapr-doc-prgrs-status"; export { type ElaprTmpltPickerConfirmPayload, diff --git a/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts b/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts new file mode 100644 index 000000000..a4cf562d2 --- /dev/null +++ b/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts @@ -0,0 +1,21 @@ +import type { ElaprDocPrgrsClientResponseDto } from "@/shared/model"; + +import type { ElaprApln } from "../model/elapr-apln-interface"; + +/** 문서 결재진행 → 결재선 그리드 시드 (ElaprApln 호환) */ +export function mapDocPrgrsToAplnRows( + list: ElaprDocPrgrsClientResponseDto[] | undefined, +): ElaprApln[] { + if (!list?.length) return []; + + return list.map((item, index) => ({ + aplnId: item.elaprPrgrsId ?? `prgrs-${item.atrzSeqNo ?? index}`, + elaprTmpltId: "", + atrzSeqNo: item.atrzSeqNo, + atrzSeComCd: item.atrzSeComCd, + atrzSeComNm: item.atrzSeComNm, + aprvrUuid: item.aprvrUuid, + aprvrNm: item.aprvrNm, + aprvrUserId: item.aprvrUserId, + })); +} diff --git a/apps/as/src/entities/elapr/lib/use-apln-rows.ts b/apps/as/src/entities/elapr/lib/use-apln-rows.ts index 384c8ffc1..dfa731d07 100644 --- a/apps/as/src/entities/elapr/lib/use-apln-rows.ts +++ b/apps/as/src/entities/elapr/lib/use-apln-rows.ts @@ -22,33 +22,35 @@ function toRow(item: ElaprApln): ElaprAplnRow { } interface UseAplnRowsOptions { - elaprTmpltId: string | null; + seedKey: string | null; serverRows: ElaprApln[] | undefined; + elaprTmpltId?: string; } export function createDraftRowKey(): string { return `draft-${Date.now()}`; } -export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) { +export function useAplnRows({ seedKey, serverRows, elaprTmpltId = "" }: UseAplnRowsOptions) { const [rows, setRows] = useState([]); const [editingRowKey, setEditingRowKey] = useState(null); useEffect(() => { - if (!elaprTmpltId) { + if (!seedKey) { setRows([]); setEditingRowKey(null); return; } setRows((serverRows ?? []).map(toRow)); setEditingRowKey(null); - }, [elaprTmpltId, serverRows]); + }, [seedKey, serverRows]); const isEditingLocked = editingRowKey != null; const visibleRows = getVisibleRows(rows); + const canAdd = Boolean(seedKey) && !isEditingLocked; const addRow = useCallback(() => { - if (!elaprTmpltId || isEditingLocked) return; + if (!canAdd) return; const rowKey = createDraftRowKey(); @@ -66,7 +68,7 @@ export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) { }, ]); setEditingRowKey(rowKey); - }, [elaprTmpltId, isEditingLocked]); + }, [canAdd, elaprTmpltId]); const startEdit = useCallback( (rowKey: string) => { diff --git a/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts b/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts index 264f45db7..5d05fd04b 100644 --- a/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts +++ b/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts @@ -45,5 +45,5 @@ export interface ElaprDmndService { update(elaprDmndId: string, body: ElaprDmndSaveRequestDto): Promise; updateStatus(elaprDmndId: string, atrzSttsComCd: string): Promise; remove(elaprDmndId: string): Promise; - findDocPrgrsByDocNo(elaprDocNo: string): Promise; + findDocPrgrsByDocNo(elaprDocNo: string, elaprCycl?: number): Promise; } diff --git a/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx b/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx index 92c3d58c5..7f7a88911 100644 --- a/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx +++ b/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx @@ -20,6 +20,7 @@ import { useElaprAplnPage } from "../api/queries"; import { validateAplnRow } from "../lib/apln-validators"; import { useAplnRows } from "../lib/use-apln-rows"; import { useDndSensors } from "../lib/use-dnd-sensors"; +import type { ElaprApln } from "../model/elapr-apln-interface"; import type { ElaprAplnRow } from "../model/elapr-apln-row-types"; import type { ReviewerOption } from "../model/reviewer-option"; @@ -27,13 +28,17 @@ import { AprvrPickerDialog } from "./aprvr-picker-dialog"; import { SortableAplnPickerRow } from "./sortable-apln-picker-row"; interface ElaprAplnPickerGridProps { - elaprTmpltId: string | null; + elaprTmpltId?: string | null; + externalServerRows?: ElaprApln[]; + isExternalLoading?: boolean; onRowsChange?: (rows: ElaprAplnRow[]) => void; onEditingLockedChange?: (locked: boolean) => void; } function ElaprAplnPickerGrid({ - elaprTmpltId, + elaprTmpltId = null, + externalServerRows, + isExternalLoading = false, onRowsChange, onEditingLockedChange, }: ElaprAplnPickerGridProps) { @@ -41,14 +46,18 @@ function ElaprAplnPickerGrid({ const [pickingRowKey, setPickingRowKey] = useState(null); const alert = useAlertStore((state) => state.setMessage); + const isExternalMode = externalServerRows != null; const aplnQuery = useElaprAplnPage({ - elaprTmpltId: elaprTmpltId ?? undefined, + elaprTmpltId: !isExternalMode ? (elaprTmpltId ?? undefined) : undefined, page: 0, size: 200, sort: "atrzSeqNo,asc", }); + const seedKey = isExternalMode ? "external-doc-prgrs" : elaprTmpltId; + const serverRows = isExternalMode ? externalServerRows : aplnQuery.data?.content; + const { rows, visibleRows, @@ -62,8 +71,9 @@ function ElaprAplnPickerGrid({ markDeleted, reorderRows, } = useAplnRows({ - elaprTmpltId, - serverRows: aplnQuery.data?.content, + seedKey, + serverRows, + elaprTmpltId: elaprTmpltId ?? "", }); useEffect(() => { @@ -75,7 +85,10 @@ function ElaprAplnPickerGrid({ }, [isEditingLocked, onEditingLockedChange]); const sensors = useDndSensors(); - const isDisabled = !elaprTmpltId; + const isReady = isExternalMode || Boolean(elaprTmpltId); + const isLoading = isExternalMode + ? isExternalLoading + : aplnQuery.isPending && Boolean(elaprTmpltId); const pickingRow = pickingRowKey ? rows.find((r) => r.rowKey === pickingRowKey) : undefined; function handleDragEnd(event: DragEndEvent) { @@ -121,7 +134,7 @@ function ElaprAplnPickerGrid({ size="sm" type="button" color="green" - disabled={isDisabled || isEditingLocked} + disabled={!isReady || isEditingLocked} onClick={addRow} > 결재선 추가 @@ -129,15 +142,15 @@ function ElaprAplnPickerGrid({ - {aplnQuery.isPending && elaprTmpltId ? ( + {isLoading ? (
- ) : !elaprTmpltId ? ( + ) : !isReady ? (

결재서식을 선택하세요.

) : visibleRows.length === 0 ? ( -

+

등록된 결재선이 없습니다. [결재선 추가]로 결재자를 등록하세요.

) : ( diff --git a/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-picker-dialog.tsx b/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-picker-dialog.tsx new file mode 100644 index 000000000..0d9b5161e --- /dev/null +++ b/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-picker-dialog.tsx @@ -0,0 +1,129 @@ +"use client"; + +import { useCallback, useMemo, useState } from "react"; + +import { useAlertStore } from "@/shared/lib"; +import { + Button, + Dialog, + DialogContent, + DialogFooter, + DialogHeader, + DialogTitle, +} from "@common/components"; + +import { useElaprDocPrgrsByDocNo } from "../api/queries"; +import { + getVisibleRows, + validateAllRowsForSave, + validateAtrzOrder, + validateUniqueSeqNo, +} from "../lib/apln-validators"; +import { mapDocPrgrsToAplnRows } from "../lib/doc-prgrs-to-apln-rows"; +import type { ElaprAplnRow } from "../model/elapr-apln-row-types"; + +import { ElaprAplnPickerGrid } from "./elapr-apln-picker-grid"; + +interface ElaprDocPrgrsPickerConfirmPayload { + aplnRows: ElaprAplnRow[]; +} + +interface ElaprDocPrgrsPickerDialogProps { + open: boolean; + elaprDocNo: string; + onClose: () => void; + onConfirm?: (payload: ElaprDocPrgrsPickerConfirmPayload) => void; +} + +function ElaprDocPrgrsPickerDialog({ + open, + elaprDocNo, + onClose, + onConfirm, +}: ElaprDocPrgrsPickerDialogProps) { + const alert = useAlertStore((state) => state.setMessage); + const [aplnRows, setAplnRows] = useState([]); + const [isEditingLocked, setIsEditingLocked] = useState(false); + + const docPrgrsQuery = useElaprDocPrgrsByDocNo(elaprDocNo, { + elaprCycl: 1, + enabled: open && Boolean(elaprDocNo), + }); + + const externalServerRows = useMemo( + () => mapDocPrgrsToAplnRows(docPrgrsQuery.data), + [docPrgrsQuery.data], + ); + + const handleRowsChange = useCallback((rows: ElaprAplnRow[]) => { + setAplnRows(rows); + }, []); + + const handleEditingLockedChange = useCallback((locked: boolean) => { + setIsEditingLocked(locked); + }, []); + + function handleOpenChange(isOpen: boolean) { + if (!isOpen) { + setAplnRows([]); + setIsEditingLocked(false); + onClose(); + } + } + + function handleConfirm() { + const rowsError = validateAllRowsForSave(aplnRows, isEditingLocked); + if (rowsError) { + alert(rowsError); + return; + } + + const orderError = validateAtrzOrder(aplnRows); + if (orderError) { + alert(orderError); + return; + } + + const seqError = validateUniqueSeqNo(aplnRows); + if (seqError) { + alert(seqError); + return; + } + + const visibleRows = getVisibleRows(aplnRows); + onConfirm?.({ aplnRows: visibleRows }); + + setAplnRows([]); + setIsEditingLocked(false); + onClose(); + } + + return ( + + + + 결재선 선택 + + + + + + + + + + + ); +} + +export { ElaprDocPrgrsPickerDialog }; +export type { ElaprDocPrgrsPickerConfirmPayload }; diff --git a/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-status.tsx b/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-status.tsx index 4be4cf0c3..ea23484e4 100644 --- a/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-status.tsx +++ b/apps/as/src/entities/elapr/ui/elapr-doc-prgrs-status.tsx @@ -1,6 +1,6 @@ "use client"; -import { Fragment } from "react"; +import { Fragment, useEffect, useMemo, useState } from "react"; import { ChevronRight } from "lucide-react"; @@ -8,7 +8,7 @@ import { dayjs, useUserStore } from "@/shared/lib"; import type { ElaprDocPrgrsClientResponseDto } from "@/shared/model"; import { SectionCollapsible } from "@/shared/ui"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip"; -import { cn, Skeleton } from "@common/components"; +import { cn, Skeleton, Tabs, TabsContent, TabsList, TabsTrigger } from "@common/components"; import { useElaprDocPrgrsByDocNo } from "../api/queries"; import { getApproverStatus, sortByAtrzSeqNo } from "../lib/approval-utils"; @@ -67,10 +67,46 @@ function ElaprDocPrgrsStep({ item }: { item: ElaprDocPrgrsClientResponseDto }) { ); } +function ElaprDocPrgrsStepList({ steps }: { steps: ElaprDocPrgrsClientResponseDto[] }) { + if (steps.length === 0) { + return

결재선이 없습니다.

; + } + + return ( +
+ {steps.map((item, index) => ( + + {index > 0 && ( +
+ +
+ )} + + + ))} +
+ ); +} + function ElaprDocPrgrsStatus({ elaprDocNo }: ElaprDocPrgrsStatusProps) { const userInfo = useUserStore((state) => state.userInfo); const { data, isLoading } = useElaprDocPrgrsByDocNo(elaprDocNo); - const steps = sortByAtrzSeqNo(data ?? []); + const [activeCycl, setActiveCycl] = useState<"1" | "2">("1"); + + const { cycl1Steps, cycl2Steps, hasCycl2 } = useMemo(() => { + const rows = data ?? []; + const cycl1 = sortByAtrzSeqNo(rows.filter((item) => Number(item.elaprCycl ?? 1) !== 2)); + const cycl2 = sortByAtrzSeqNo(rows.filter((item) => Number(item.elaprCycl) === 2)); + return { + cycl1Steps: cycl1, + cycl2Steps: cycl2, + hasCycl2: cycl2.length > 0, + }; + }, [data]); + + useEffect(() => { + setActiveCycl(hasCycl2 ? "2" : "1"); + }, [hasCycl2]); if (userInfo?.dtlInstCd !== "ROLE_USER01") { return null; @@ -88,24 +124,40 @@ function ElaprDocPrgrsStatus({ elaprDocNo }: ElaprDocPrgrsStatusProps) { ); } - if (steps.length === 0) { + if (cycl1Steps.length === 0 && cycl2Steps.length === 0) { return null; } return ( -
- {steps.map((item, index) => ( - - {index > 0 && ( -
- {} -
- )} - - - ))} -
+ {hasCycl2 ? ( + setActiveCycl(value as "1" | "2")} + className="p-2" + > + + + 재원협의 + + + 실무협의서 + + + +
+ +
+ + +
+ +
+ + + ) : ( + + )} ); } diff --git a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts index d0b906dae..92bf5b83e 100644 --- a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts +++ b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts @@ -38,10 +38,7 @@ const ROLE_STATUS_BUTTON_ACTIONS: Record )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.dsgntRvwr) && ( - )} @@ -615,7 +638,11 @@ function FloatingActionButtons({ )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.dmndSplmnt) && ( - )} @@ -643,6 +670,13 @@ function FloatingActionButtons({ onConfirm={handleElaprTmpltConfirm} /> + setActiveDialog(null)} + onConfirm={handleElaprDocPrgrsConfirm} + /> + Date: Wed, 16 Sep 2026 14:19:39 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[as]=20feat:=20=EC=8B=A4=EB=AC=B4=ED=98=91?= =?UTF-8?q?=EC=9D=98=EC=84=9C=20=EA=B2=80=ED=86=A0=20=EB=A1=9C=EC=A7=81(RR?= =?UTF-8?q?,=20RK)=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/pwrk-cnsltn/ref-frontend-entities.md | 2 + .../as/docs/pwrk-cnsltn/ref-screen-buttons.md | 16 +++-- .../elapr/ui/elapr-approval-dialog.tsx | 22 ++++-- .../pages/fnrs-cnsltn/lib/button-config.ts | 43 ++++++++--- .../fnrs-cnsltn/lib/review-step-utils.ts | 5 +- .../ui/components/floating-action-buttons.tsx | 71 +++++++++++-------- 6 files changed, 103 insertions(+), 56 deletions(-) diff --git a/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md b/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md index ddb0f5f3d..fdb817e08 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md +++ b/apps/as/docs/pwrk-cnsltn/ref-frontend-entities.md @@ -346,3 +346,5 @@ To-Be: - 검토자지정은 **`ER`(1차)** 과 **`EV`(2차)** 에서. - `ER`: `elaprCycl: 1`, `docPrgrsSttsComCd: "AC"`, 서식 선택 다이얼로그 - `EV`: `elaprCycl: 2`, `docPrgrsSttsComCd: "RK"`, 1차 결재선 시드 다이얼로그(서식 없음) + +`RK` / ATRZ02 FAB: `findDocPrgrsByDocNo` 전체 조회 후 pending은 `elaprCycl === 2`만 사용. 검토완료 후 `ElaprApprovalDialog`에 `elaprCycl={2}`. 보완요청은 TE와 동일 `SplmntDmndDialog`. diff --git a/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md b/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md index 1c9d8565d..c0b7d2a08 100644 --- a/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md +++ b/apps/as/docs/pwrk-cnsltn/ref-screen-buttons.md @@ -70,7 +70,7 @@ API 컬럼은 [ref-endpoint.md](./ref-endpoint.md)와 동일. | 33 | 상세 | USER01 | 검토자 | `RK` | 검토완료 | `RK` | 다음 결재자 | `process` | | 34 | 상세 | USER01 | 승인자 | `RK` | 결재(승인) | `RK` | 다음 결재자 | `process` | | 35 | 상세 | USER01 | 최종승인자 | `RK` | 결재(회신) | `RR` | 환경청 | `process` 최종 | -| 36 | 상세 | USER03 | - | `RR` | 결과회신 | `EP` | 광역 | `updatePrgrsStts` | +| 36 | 상세 | USER03 | - | `RR` | 실무협의서 관리(조회), 검토결과 회신 | `EP` | 광역 | `tech-review` | | 37 | 작성/상세 | USER04 | - | `EP` | 결과회신 | `TA` | 기초 | `updatePrgrsStts` | | 38 | 상세 | USER05 | - | `TA` | 결과회신 | — | — | **API 없음. 조회** | @@ -121,7 +121,7 @@ ROLE_USER03 LE → 결과회신(자체종결), 기술검토 의뢰 TP → 재원협의 결과 회신 RA → 실무협의서 관리(조회), 조치결과 검토의뢰 - RR → 결과회신 + RR → 실무협의서 관리(조회), 검토결과 회신 (`tech-review` → `EP`) ``` ### 3-2. 공단 결재선 × 상태 @@ -141,14 +141,18 @@ TE / ATRZ03 승인자 → 결재(승인) TE / ATRZ99 최종 → 결재(회신) RK / ATRZ02 검토자 - → 실무협의서관리, 금액검증, 저장, 검토완료, 보완요청 -RK / ATRZ03 → 결재(승인) -RK / ATRZ99 → 결재(회신) + → (초안 완료) 실무협의서관리 + → (초안 완료 + 결재 대기 ATRZ_PRGRS_002, cycl2) 보완요청, 검토완료 + · 보완요청 UI: TE와 동일 SplmntDmndDialog +RK / ATRZ03 → (초안 완료) 실무협의서관리, (cycl2 pending) 결재(승인) +RK / ATRZ99 → (초안 완료) 실무협의서관리, (cycl2 pending) 결재(회신) + · 결재 UI: ElaprApprovalDialog (elaprCycl=2) 승인/반려 → PUT process ``` `FV`, `AC`, `AV`: 액션 빈 배열 + 진행 패널. -현행 `TE`에서 `hasPendingApprovalRequest === false`이면 버튼을 숨긴다. v3.0에서는 검토자 버튼(저장·웹기안기·보완)은 결재 대기와 무관하게 두고, **검토완료/결재**만 결재건 존재 여부에 묶는다. +`PENDING_APPROVAL_ACTIONS`: `dmndSplmnt`, `rvwCmptn`, `atrzAprv`, `atrzRply`만. +`pwrkCnsltnDocMng`는 결재 대기와 무관(초안 완료만). ATRZ02·ATRZ03·ATRZ99라도 pending 없으면 관리만 노출. --- diff --git a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx index ad9abfa3e..0f7cfd056 100644 --- a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx +++ b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx @@ -1,6 +1,6 @@ "use client"; -import { useState } from "react"; +import { useMemo, useState } from "react"; import { closestCenter, DndContext, type DragEndEvent } from "@dnd-kit/core"; import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable"; @@ -48,6 +48,7 @@ interface ElaprApprovalDialogProps { onOpenChange: (open: boolean) => void; elaprDocNo: string; currentUserUuid: string; + elaprCycl?: number; onSuccess: () => void; } @@ -58,6 +59,7 @@ function ElaprApprovalDialog({ onOpenChange, elaprDocNo, currentUserUuid, + elaprCycl, onSuccess, }: ElaprApprovalDialogProps) { const queryClient = useQueryClient(); @@ -67,9 +69,15 @@ function ElaprApprovalDialog({ const [pickerOpen, setPickerOpen] = useState(false); const [pickingRowKey, setPickingRowKey] = useState(null); - const { data: elaprDocPrgrsList, isLoading } = useElaprDocPrgrsByDocNo(open ? elaprDocNo : null); + const { data: elaprDocPrgrsList, isLoading } = useElaprDocPrgrsByDocNo(open ? elaprDocNo : null, { + elaprCycl, + }); + const cyclDocPrgrsList = useMemo(() => { + if (elaprCycl == null) return elaprDocPrgrsList; + return elaprDocPrgrsList?.filter((row) => Number(row.elaprCycl) === elaprCycl); + }, [elaprCycl, elaprDocPrgrsList]); - const elaprDmndId = elaprDocPrgrsList?.[0]?.elaprDmndId; + const elaprDmndId = cyclDocPrgrsList?.[0]?.elaprDmndId; const { rows, @@ -85,7 +93,7 @@ function ElaprApprovalDialog({ markDeleted, reorderRows, } = usePrgrsSttsRows({ - serverRows: elaprDocPrgrsList, + serverRows: cyclDocPrgrsList, elaprDmndId, }); @@ -93,14 +101,14 @@ function ElaprApprovalDialog({ const sensors = useDndSensors(); const currentUserPrgrs = findCurrentUserPendingApprovalRequest( - elaprDocPrgrsList, + cyclDocPrgrsList, currentUserUuid, ); const canApprove = Boolean(currentUserPrgrs?.elaprPrgrsId); const pickingRow = pickingRowKey ? rows.find((r) => r.rowKey === pickingRowKey) : undefined; const isBusy = isProcessing || savePrgrsSttsMutation.isPending; - const isPrgrsSttsUnsaved = hasUnsavedPrgrsSttsChanges(rows, elaprDocPrgrsList ?? []); + const isPrgrsSttsUnsaved = hasUnsavedPrgrsSttsChanges(rows, cyclDocPrgrsList ?? []); function handleDragEnd(event: DragEndEvent) { const { active, over } = event; @@ -164,7 +172,7 @@ function ElaprApprovalDialog({ return; } - const payload = buildPrgrsSttsSavePayload(rows, elaprDmndId, elaprDocPrgrsList ?? []); + const payload = buildPrgrsSttsSavePayload(rows, elaprDmndId, cyclDocPrgrsList ?? []); if (payload.length === 0) { alert("변경된 결재선이 없습니다."); return; diff --git a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts index 92bf5b83e..cb705cffe 100644 --- a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts +++ b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts @@ -53,10 +53,14 @@ const ROLE_STATUS_BUTTON_ACTIONS: Record([ - ...ROLE_USER01_ATRZ_STATUS_ACTIONS.TE.ATRZ02, + FNRS_CNSLTN_VIEW_BUTTON_ACTION.dmndSplmnt, + FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwCmptn, FNRS_CNSLTN_VIEW_BUTTON_ACTION.atrzAprv, FNRS_CNSLTN_VIEW_BUTTON_ACTION.atrzRply, ]); @@ -129,15 +146,19 @@ function resolveRoleUser01AtrzButtonActions( const needsPendingApproval = PENDING_APPROVAL_ACTIONS.has(action); if (needsPendingApproval && options?.hasPendingApprovalRequest === false) return false; - if (prgrsSttsComCd === "TE" && options?.hasCompletedDraft != null) { - if ( - action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.pwrkCnsltnDocMng || - action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRsltInq - ) { - return options.hasCompletedDraft; + if (options?.hasCompletedDraft != null) { + if (prgrsSttsComCd === "TE" || prgrsSttsComCd === "RK") { + if (action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.pwrkCnsltnDocMng) { + return options.hasCompletedDraft; + } } - if (action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.pwrkCnsltnDocCrt) { - return !options.hasCompletedDraft; + if (prgrsSttsComCd === "TE") { + if (action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRsltInq) { + return options.hasCompletedDraft; + } + if (action === FNRS_CNSLTN_VIEW_BUTTON_ACTION.pwrkCnsltnDocCrt) { + return !options.hasCompletedDraft; + } } } diff --git a/apps/as/src/pages/fnrs-cnsltn/lib/review-step-utils.ts b/apps/as/src/pages/fnrs-cnsltn/lib/review-step-utils.ts index bce365857..0ba84b926 100644 --- a/apps/as/src/pages/fnrs-cnsltn/lib/review-step-utils.ts +++ b/apps/as/src/pages/fnrs-cnsltn/lib/review-step-utils.ts @@ -32,7 +32,10 @@ export function getEditableReviewStep( dtlInstCd?: string, prgrsSttsComCd?: string, ): ReviewStepCode | undefined { - if (dtlInstCd === "ROLE_USER03" && (prgrsSttsComCd === "LE" || prgrsSttsComCd === "TP")) { + if ( + dtlInstCd === "ROLE_USER03" && + (prgrsSttsComCd === "LE" || prgrsSttsComCd === "TP" || prgrsSttsComCd === "RR") + ) { return "ENV"; } diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx index 83a38980d..187a72fa3 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx @@ -113,30 +113,37 @@ function FloatingActionButtons({ const isRegister = data.detDto?.rgtr === userInfo?.userUnqId; const needsAtrzResolve = needsRoleUser01AtrzResolve(dtlInstCd, prgrsSttsComCd); - const needsTeApprovalCheck = needsAtrzResolve && prgrsSttsComCd === "TE"; + const needsElaprPrgrsCheck = needsAtrzResolve && ["TE", "RK"].includes(prgrsSttsComCd); const needsPwrkDraftCheck = dtlInstCd === "ROLE_USER01" && ["TE", "RK"].includes(prgrsSttsComCd); const needsPwrkForRb = dtlInstCd === "ROLE_USER05" && prgrsSttsComCd === "RB"; const needsPwrkLookup = needsPwrkDraftCheck || needsPwrkForRb; + const { data: elaprDocPrgrsList = [], isLoading: isElaprDocPrgrsLoading } = - useElaprDocPrgrsByDocNo(needsTeApprovalCheck ? docNo : null); + useElaprDocPrgrsByDocNo(needsElaprPrgrsCheck ? docNo : null); + const { data: pwrkCnsltnData, isLoading: isPwrkCnsltnLoading } = usePwrkCnsltnMngByUpDocNo( docNo, needsPwrkLookup, ); + const hasCompletedDraft = Boolean(findCompletedPwrkDraft(pwrkCnsltnData)); const pwrkCnsltnDocNo = pwrkCnsltnData?.pwrkCnsltnDocNo; + const elaprPrgrsForPending = + prgrsSttsComCd === "RK" + ? elaprDocPrgrsList.filter((row) => Number(row.elaprCycl) === 2) + : elaprDocPrgrsList; const hasPendingApprovalRequest = hasCurrentUserPendingApprovalRequest( - elaprDocPrgrsList, + elaprPrgrsForPending, userInfo?.userUnqId, ); const actionButtons = useMemo(() => { if (needsAtrzResolve && isRvwLoginUserLoading) return []; - if (needsTeApprovalCheck && isElaprDocPrgrsLoading) return []; + if (needsElaprPrgrsCheck && isElaprDocPrgrsLoading) return []; if (needsPwrkDraftCheck && isPwrkCnsltnLoading) return []; return getButtonConfigs(dtlInstCd, prgrsSttsComCd, atrzSeComCdList, { - hasPendingApprovalRequest: needsTeApprovalCheck ? hasPendingApprovalRequest : undefined, + hasPendingApprovalRequest: needsElaprPrgrsCheck ? hasPendingApprovalRequest : undefined, hasCompletedDraft: needsPwrkDraftCheck ? hasCompletedDraft : undefined, }); }, [ @@ -148,7 +155,7 @@ function FloatingActionButtons({ isPwrkCnsltnLoading, isRvwLoginUserLoading, needsAtrzResolve, - needsTeApprovalCheck, + needsElaprPrgrsCheck, needsPwrkDraftCheck, prgrsSttsComCd, ]); @@ -336,11 +343,12 @@ function FloatingActionButtons({ return; } + const isResultReply = prgrsSttsComCd === "RR"; const payload = buildTechReviewReplyPayload( data, checklistFormState, "ENV", - "RM", + isResultReply ? "EP" : "RM", "CP", getReviewOpinionFormData(), opnrNm, @@ -349,7 +357,9 @@ function FloatingActionButtons({ await executeAction({ action: FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRply, request: payload, - successMessage: "재원협의 결과 회신이 완료되었습니다.", + successMessage: isResultReply + ? "검토결과 회신이 완료되었습니다." + : "재원협의 결과 회신이 완료되었습니다.", }); techReviewOpinionRef?.current?.resetForm(); } @@ -432,15 +442,17 @@ function FloatingActionButtons({ } async function handleRvwCmptnClick() { - const { percent } = computeReviewStepChecklistProgress( - data.cklstResultList ?? [], - checklistFormState.results, - "KECO", - ); + if (prgrsSttsComCd === "TE") { + const { percent } = computeReviewStepChecklistProgress( + data.cklstResultList ?? [], + checklistFormState.results, + "KECO", + ); - if (percent !== 100) { - alert("모든 체크리스트 항목을 체크해야 검토완료가 가능합니다."); - return; + if (percent !== 100) { + alert("모든 체크리스트 항목을 체크해야 검토완료가 가능합니다."); + return; + } } const payload = { @@ -448,7 +460,7 @@ function FloatingActionButtons({ data, checklistFormState, "KECO", - "TE", + prgrsSttsComCd, "SV", getReviewOpinionFormData(), opnrNm, @@ -585,7 +597,7 @@ function FloatingActionButtons({ )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRply) && ( )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.rqstTechRvw) && ( @@ -698,6 +710,7 @@ function FloatingActionButtons({ onOpenChange={(open) => setActiveDialog(open ? "elaprApproval" : null)} elaprDocNo={data.detDto?.fnrsCnsltnDocNo ?? fnrsCnsltnDocNo} currentUserUuid={userInfo?.userUnqId ?? ""} + elaprCycl={prgrsSttsComCd === "RK" ? 2 : undefined} onSuccess={() => { queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.detail(fnrsCnsltnDocNo), @@ -709,7 +722,13 @@ function FloatingActionButtons({ open={activeDialog === "pwrkCnsltnDocMng"} fnrsCnsltnDocNo={docNo} atrzSeComCdList={atrzSeComCdList} - canSave={prgrsSttsComCd === "RA" ? false : undefined} + canSave={ + prgrsSttsComCd === "RA" || + prgrsSttsComCd === "RR" || + (needsElaprPrgrsCheck && !hasPendingApprovalRequest) + ? false + : undefined + } onClose={() => setActiveDialog(null)} /> @@ -840,16 +859,6 @@ async function handleActnCmptn( } } -async function handleAtrzAprv(context: ActionHandlerContext): Promise { - // TODO: 결재 승인 처리 API 호출 - context.onSuccess?.(); -} - -async function handleAtrzRply(context: ActionHandlerContext): Promise { - // TODO: 결재 회신 처리 API 호출 - context.onSuccess?.(); -} - const buttonActionHandlers: Record = { strg: handleSaveApply, aply: handleSaveApply, @@ -869,8 +878,8 @@ const buttonActionHandlers: Record = rvwStrg: handleTechReview, rvwCmptn: handleTechReview, dmndSplmnt: handleDmndSplmnt, - atrzAprv: handleAtrzAprv, - atrzRply: handleAtrzRply, + atrzAprv: () => Promise.resolve(), + atrzRply: () => Promise.resolve(), actnCmptn: handleActnCmptn, rqstActnRvw: handleRequestActnReview, }; From e8a5701e73af0a7e9598128fc3f7a75c2850d476 Mon Sep 17 00:00:00 2001 From: bicochan Date: Wed, 16 Sep 2026 17:37:44 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[as]=20feat:=20=EC=9B=B9=EA=B8=B0=EC=95=88?= =?UTF-8?q?=EA=B8=B0=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=82=B4=20=EA=B8=88=EC=95=A1=EA=B2=80=EC=A6=9D=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=84=B9=EC=85=98=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/as/public/webhwpctrl/hwpsdkmain.html | 81 ++++++++++------ .../pwrk-cnsltn-doc-pjtco-ajmt-mng-service.ts | 24 +++++ .../api/queries.ts | 22 +++++ .../pwrk-cnsltn-doc-pjtco-ajmt-mng/index.ts | 10 ++ ...wrk-cnsltn-doc-pjtco-ajmt-mng-interface.ts | 44 +++++++++ .../lib/fnrs-cnsltn-regist-schema.ts | 4 +- .../components/pwrk-cnsltn-doc-mng-dialog.tsx | 78 ++++++++++++--- .../pwrk-cnsltn-doc-pjtco-ajmt-table.tsx | 97 +++++++++++++++++++ apps/as/src/shared/config/api.ts | 1 + apps/as/src/shared/model/pbadms-sprt.ts | 2 +- .../widgets/hangulgiangi/model/hwp-ctrl.ts | 1 + .../widgets/hangulgiangi/ui/hangul-giangi.tsx | 5 +- .../pbadms-sprt/lib/checklist-form-utils.ts | 6 +- 13 files changed, 325 insertions(+), 50 deletions(-) create mode 100644 apps/as/src/entities/pwrk-cnsltn-doc-pjtco-ajmt-mng/api/pwrk-cnsltn-doc-pjtco-ajmt-mng-service.ts create mode 100644 apps/as/src/entities/pwrk-cnsltn-doc-pjtco-ajmt-mng/api/queries.ts create mode 100644 apps/as/src/entities/pwrk-cnsltn-doc-pjtco-ajmt-mng/index.ts create mode 100644 apps/as/src/entities/pwrk-cnsltn-doc-pjtco-ajmt-mng/model/pwrk-cnsltn-doc-pjtco-ajmt-mng-interface.ts create mode 100644 apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-doc-pjtco-ajmt-table.tsx diff --git a/apps/as/public/webhwpctrl/hwpsdkmain.html b/apps/as/public/webhwpctrl/hwpsdkmain.html index d24c7eee7..3f4bc1526 100644 --- a/apps/as/public/webhwpctrl/hwpsdkmain.html +++ b/apps/as/public/webhwpctrl/hwpsdkmain.html @@ -6,36 +6,57 @@ - - - - Hwp SDK Wasm Sample - - - - - - - {isPjtcoAjmtTableOpen ? ( -
-
-

금액검증결과

- -
-
- -
-
- ) : ( - - )} + {pjtcoAjmtPage?.content?.length ? ( + isPjtcoAjmtTableOpen ? ( +
+
+

금액검증결과

+ +
+
+ +
+
+ ) : ( + + ) + ) : null} ) : null} From 41643563f801ab2d43a787a335f3d643538853ab Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 17 Sep 2026 10:55:51 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[as]=20chore:=20=EC=88=98=EC=A0=95=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/as/src/pages/fnrs-cnsltn/model/columns.tsx | 8 ++++---- apps/as/src/pages/instl-sncn/model/columns.tsx | 4 ++-- apps/as/src/pages/sewer-bsc-plan/model/columns.tsx | 4 ++-- .../widgets/pbadms-sprt/ui/business-cost-form-section.tsx | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx b/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx index fff55d21a..2374b0c40 100644 --- a/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/model/columns.tsx @@ -12,7 +12,7 @@ const columnHelper = createColumnHelper(); const MAIN_STEP_LABELS = { apply: "재원협의 신청", - envoReview: "환경청 검토", + envoReview: "재원협의 검토", techReview: "기술검토", reply: "검토결과 회신", } as const; @@ -20,7 +20,7 @@ const MAIN_STEP_LABELS = { export const PROGRESS_STATUS_COLUMNS = [ { label: "재원협의 신청 (시군)", sttsComCd: "ST" }, { label: "재원협의 신청 (시도)", sttsComCd: "LE" }, - { label: "환경청 검토", sttsComCd: "ER" }, + { label: "재원협의 검토", sttsComCd: "ER" }, { label: "기술검토", sttsComCd: "TE" }, { label: "기술검토 회신", sttsComCd: "TP" }, { label: "환경청 검토 결과 회신", sttsComCd: "EP" }, @@ -61,7 +61,7 @@ function buildProgressBadges(prgrsSttsComCd: string, techRplyHstryYn: "Y" | "N") ]; } - if (prgrsSttsComCd === "ER" || prgrsSttsComCd === "TE" || prgrsSttsComCd === "SL") { + if (["FV", "ER", "AC", "TE", "RB", "RA", "AV", "EV", "RK", "RR", "SL"].includes(prgrsSttsComCd)) { return [ { label: MAIN_STEP_LABELS.apply, state: "completed" }, { label: MAIN_STEP_LABELS.envoReview, state: "completed" }, @@ -82,7 +82,7 @@ function buildProgressBadges(prgrsSttsComCd: string, techRplyHstryYn: "Y" | "N") ]; } - if (prgrsSttsComCd === "EP") { + if (prgrsSttsComCd === "EP" || prgrsSttsComCd === "TA") { return [ { label: MAIN_STEP_LABELS.apply, state: "completed" }, { label: MAIN_STEP_LABELS.envoReview, state: "completed" }, diff --git a/apps/as/src/pages/instl-sncn/model/columns.tsx b/apps/as/src/pages/instl-sncn/model/columns.tsx index 2dcca5c58..11d51de65 100644 --- a/apps/as/src/pages/instl-sncn/model/columns.tsx +++ b/apps/as/src/pages/instl-sncn/model/columns.tsx @@ -12,7 +12,7 @@ const columnHelper = createColumnHelper(); const MAIN_STEP_LABELS = { apply: "설치인가 신청", - envoReview: "환경청 검토", + envoReview: "설치인가 검토", techReview: "기술검토", reply: "검토결과 회신", } as const; @@ -20,7 +20,7 @@ const MAIN_STEP_LABELS = { export const PROGRESS_STATUS_COLUMNS = [ { label: "설치인가 신청 (시군)", sttsComCd: "ST" }, { label: "설치인가 신청 (시도)", sttsComCd: "LE" }, - { label: "환경청 검토", sttsComCd: "ER" }, + { label: "설치인가 검토", sttsComCd: "ER" }, { label: "기술검토", sttsComCd: "TE" }, { label: "기술검토 회신", sttsComCd: "TP" }, { label: "검토결과 회신", sttsComCd: "EP" }, 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 4dc1af0c6..e75312b0b 100644 --- a/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx +++ b/apps/as/src/pages/sewer-bsc-plan/model/columns.tsx @@ -12,14 +12,14 @@ const columnHelper = createColumnHelper(); const MAIN_STEP_LABELS = { apply: "기본계획 신청", - envoReview: "환경청 검토", + envoReview: "기본계획 검토", techReview: "기술검토", reply: "검토결과 회신", } as const; export const PROGRESS_STATUS_COLUMNS = [ { label: "기본계획 신청 (시군)", sttsComCd: "LE" }, - { label: "환경청 검토", sttsComCd: "ER" }, + { label: "기본계획 검토", sttsComCd: "ER" }, { label: "기술검토", sttsComCd: "TE" }, { label: "기술검토 회신", sttsComCd: "TP" }, { label: "횐경청 검토 결과 회신", sttsComCd: "EP" }, diff --git a/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx b/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx index 22aa35c82..15ff2a413 100644 --- a/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx +++ b/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx @@ -104,7 +104,7 @@ function BusinessCostFormSection() { const data = bizCstList[idx]; if (!data) return null; - const diff = (data.tstmDesignAmt || 0) - (data.bgtRfltAmt || 0); + const diff = (data.tstmDesignAmt || 0) - (data.bscPlanAmt || 0); const paddingLeft = `${item.level * 1.6}rem`; const showSubIcon = item.level >= 2; From 086d5a18e859ba6d4736294acee71d45560fdff4 Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 17 Sep 2026 16:48:13 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[as]=20chore:=20=EC=9E=AC=EC=9B=90=ED=98=91?= =?UTF-8?q?=EC=9D=98=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/as/src/entities/elapr/api/queries.ts | 3 +- .../elapr/ui/elapr-approval-dialog.tsx | 6 +- .../pages/fnrs-cnsltn/lib/button-config.ts | 15 ++--- .../ui/components/floating-action-buttons.tsx | 63 ++++++------------- .../components/pwrk-cnsltn-doc-mng-dialog.tsx | 10 +-- .../pwrk-cnsltn-rvw-rslt-inq-dialog.tsx | 14 ++--- .../pages/fnrs-cnsltn/ui/fnrs-form-page.tsx | 31 +++++++-- .../sections/tech-review-opinion-section.tsx | 3 +- apps/as/src/shared/model/pbadms-sprt.ts | 4 +- .../pbadms-sprt/lib/fnrs-shar-form-utils.ts | 10 +-- .../ui/business-cost-form-section.tsx | 10 +-- .../pbadms-sprt/ui/splmnt-dmnd-dialog.tsx | 6 +- 12 files changed, 81 insertions(+), 94 deletions(-) diff --git a/apps/as/src/entities/elapr/api/queries.ts b/apps/as/src/entities/elapr/api/queries.ts index 19f5fce9b..9908ef44f 100644 --- a/apps/as/src/entities/elapr/api/queries.ts +++ b/apps/as/src/entities/elapr/api/queries.ts @@ -187,13 +187,14 @@ export function useElaprDmnd(elaprDmndId: string | null | undefined) { export function useElaprDocPrgrsByDocNo( elaprDocNo: string | null | undefined, - options?: { elaprCycl?: number; enabled?: boolean }, + options?: { elaprCycl?: number; enabled?: boolean; structuralSharing?: boolean }, ) { const elaprCycl = options?.elaprCycl; return useQuery({ queryKey: [...elaprDmndBaseKey, "findDocPrgrsByDocNo", elaprDocNo, elaprCycl], queryFn: () => elaprDmndService.findDocPrgrsByDocNo(elaprDocNo!, elaprCycl), enabled: Boolean(elaprDocNo) && (options?.enabled ?? true), + structuralSharing: options?.structuralSharing ?? true, }); } diff --git a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx index 0f7cfd056..ed8a5de01 100644 --- a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx +++ b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx @@ -71,6 +71,7 @@ function ElaprApprovalDialog({ const { data: elaprDocPrgrsList, isLoading } = useElaprDocPrgrsByDocNo(open ? elaprDocNo : null, { elaprCycl, + structuralSharing: false, }); const cyclDocPrgrsList = useMemo(() => { if (elaprCycl == null) return elaprDocPrgrsList; @@ -100,10 +101,7 @@ function ElaprApprovalDialog({ const savePrgrsSttsMutation = useSaveElaprPrgrsStts(); const sensors = useDndSensors(); - const currentUserPrgrs = findCurrentUserPendingApprovalRequest( - cyclDocPrgrsList, - currentUserUuid, - ); + const currentUserPrgrs = findCurrentUserPendingApprovalRequest(cyclDocPrgrsList, currentUserUuid); const canApprove = Boolean(currentUserPrgrs?.elaprPrgrsId); const pickingRow = pickingRowKey ? rows.find((r) => r.rowKey === pickingRowKey) : undefined; diff --git a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts index 21c5ed562..8ec805852 100644 --- a/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts +++ b/apps/as/src/pages/fnrs-cnsltn/lib/button-config.ts @@ -2,11 +2,9 @@ export const FNRS_CNSLTN_VIEW_BUTTON_ACTION = { strg: "strg", aply: "aply", del: "del", - fnrsCnsltnAncmnt: "fnrsCnsltnAncmnt", envoSbmsn: "envoSbmsn", rjct: "rjct", sncnAprv: "sncnAprv", - lclRply: "lclRply", rvwRply: "rvwRply", rqstTechRvw: "rqstTechRvw", fileSplmnt: "fileSplmnt", @@ -39,14 +37,10 @@ const ROLE_STATUS_BUTTON_ACTIONS: Record([ + FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRsltInq, + FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwStrg, FNRS_CNSLTN_VIEW_BUTTON_ACTION.dmndSplmnt, FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwCmptn, FNRS_CNSLTN_VIEW_BUTTON_ACTION.atrzAprv, diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx index ccb066a51..7b776614d 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/components/floating-action-buttons.tsx @@ -262,19 +262,6 @@ function FloatingActionButtons({ router.push("/fnrs-cnsltn"); } - // async function handleFnrsCnsltnAncmntClick() { - // const payload: DocPrgrsUpdateRequestDto = { - // docNo, - // docSeComCd, - // prgrsSttsComCd: "TB", - // }; - // await executeAction({ - // action: FNRS_CNSLTN_VIEW_BUTTON_ACTION.fnrsCnsltnAncmnt, - // request: payload, - // successMessage: "고시되었습니다.", - // }); - // } - async function handleEnvoSbmsnClick() { const payload: DocPrgrsUpdateRequestDto = { docNo, @@ -288,19 +275,6 @@ function FloatingActionButtons({ }); } - async function handleLclRplyClick() { - const payload: DocPrgrsUpdateRequestDto = { - docNo, - docSeComCd, - prgrsSttsComCd: "RB", - }; - await executeAction({ - action: FNRS_CNSLTN_VIEW_BUTTON_ACTION.lclRply, - request: payload, - successMessage: "지자체 회신이 완료되었습니다.", - }); - } - async function handleRjctClick() { const payload: DocPrgrsUpdateRequestDto = { docNo, @@ -339,7 +313,7 @@ function FloatingActionButtons({ ); if (percent !== 100) { - alert("모든 체크리스트 항목을 체크해야 검토결과 회신이 가능합니다."); + alert("모든 체크리스트 항목을 체크해야 검토 결과 회신이 가능합니다."); return; } @@ -348,7 +322,7 @@ function FloatingActionButtons({ data, checklistFormState, "ENV", - isResultReply ? "EP" : "RM", + isResultReply ? "EP" : "RB", "CP", getReviewOpinionFormData(), opnrNm, @@ -357,21 +331,32 @@ function FloatingActionButtons({ await executeAction({ action: FNRS_CNSLTN_VIEW_BUTTON_ACTION.rvwRply, request: payload, - successMessage: isResultReply - ? "검토결과 회신이 완료되었습니다." - : "재원협의 결과 회신이 완료되었습니다.", + successMessage: "검토 결과 회신이 완료되었습니다.", }); techReviewOpinionRef?.current?.resetForm(); } async function handleRqstTechRvwClick() { + if (prgrsSttsComCd === "LE") { + const { percent } = computeReviewStepChecklistProgress( + data.cklstResultList ?? [], + checklistFormState.results, + "ENV", + ); + + if (percent !== 100) { + alert("모든 체크리스트 항목을 체크해야 기술 검토 의뢰가 가능합니다."); + return; + } + } + const payload: FnrsExamineRequestDto = { prgrsSttsComCd: "FV", }; await executeAction({ action: FNRS_CNSLTN_VIEW_BUTTON_ACTION.rqstTechRvw, request: payload, - successMessage: "기술검토 의뢰가 완료되었습니다.", + successMessage: "기술 검토 의뢰가 완료되었습니다.", }); } @@ -570,21 +555,11 @@ function FloatingActionButtons({ 삭제 )} - {/* {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.fnrsCnsltnAncmnt) && ( - - )} */} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.envoSbmsn) && ( )} - {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.lclRply) && ( - - )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.rjct) && ( )} {shouldShowButton(FNRS_CNSLTN_VIEW_BUTTON_ACTION.rqstTechRvw) && ( @@ -858,11 +833,9 @@ const buttonActionHandlers: Record = strg: handleSaveApply, aply: handleSaveApply, del: handleDel, - fnrsCnsltnAncmnt: handleChangePrgrsSttsComCd, envoSbmsn: handleChangePrgrsSttsComCd, rjct: handleChangePrgrsSttsComCd, sncnAprv: handleChangePrgrsSttsComCd, - lclRply: handleChangePrgrsSttsComCd, rvwRply: handleTechReview, rqstTechRvw: handleRequestExamine, fileSplmnt: handleDmndSplmnt, diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-doc-mng-dialog.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-doc-mng-dialog.tsx index 3dfa33efb..040d3ec40 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-doc-mng-dialog.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-doc-mng-dialog.tsx @@ -48,8 +48,8 @@ const VIEW_ONLY_PRGRS_STTS_COM_CDS = new Set(["RA", "RR", "EP", "TA"]); interface PwrkCnsltnDocMngDialogProps { open: boolean; fnrsCnsltnDocNo: string; - atrzSeComCdList: string[]; - prgrsSttsComCd: string; + atrzSeComCdList?: string[]; + prgrsSttsComCd?: string; canSave?: boolean; onClose: () => void; } @@ -257,8 +257,10 @@ function PwrkCnsltnDocMngDialog({ } const isAnyAtchUploading = uploadedFiles.some((item) => isUploading[item.fileKey]); - const viewOnly = VIEW_ONLY_PRGRS_STTS_COM_CDS.has(prgrsSttsComCd); - const canSaveByAtrz = !atrzSeComCdList.some((code) => APPROVER_ATRZ_SE_COM_CDS.has(code)); + const viewOnly = prgrsSttsComCd ? VIEW_ONLY_PRGRS_STTS_COM_CDS.has(prgrsSttsComCd) : false; + const canSaveByAtrz = atrzSeComCdList + ? !atrzSeComCdList.some((code) => APPROVER_ATRZ_SE_COM_CDS.has(code)) + : true; const canSave = !viewOnly && (canSaveProp ?? canSaveByAtrz); return ( diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-rvw-rslt-inq-dialog.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-rvw-rslt-inq-dialog.tsx index e811873f4..91a5896ff 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-rvw-rslt-inq-dialog.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/components/pwrk-cnsltn-rvw-rslt-inq-dialog.tsx @@ -96,7 +96,7 @@ function PwrkCnsltnRvwRsltInqDialog({ aria-describedby={undefined} > - 검토결과조회 + 검토 결과 조회 {isLoading ? ( @@ -159,9 +159,9 @@ function CnsltnListTable({ return ( - - - + + + @@ -172,7 +172,7 @@ function CnsltnListTable({ aria-label="전체 선택" /> - 분류 + 구분 검토의견 @@ -194,8 +194,8 @@ function CnsltnListTable({ aria-label="행 선택" /> - -

{formatOptional(row.rmrk)}

+ +

{formatOptional(row.rvwOpnnSn)}

{formatOptional(row.rvwOpnn)}

diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx index 671b70f98..632c51e3b 100644 --- a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx +++ b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx @@ -47,6 +47,7 @@ import { import { getCreateDefaultValues, mapDetailToFormData } from "../lib/form-data-mapper"; import { PROGRESS_STATUS_COLUMNS } from "../model/columns"; +import { PwrkCnsltnDocMngDialog } from "./components/pwrk-cnsltn-doc-mng-dialog"; import { BasicInfoFormSection } from "./sections/basic-info-form-section"; interface FnrsFormPageProps { mode: "create" | "edit"; @@ -66,8 +67,10 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps) const userInfo = useUserStore((state) => state.userInfo); const alert = useAlertStore((state) => state.setMessage); const [isSubmitting, setIsSubmitting] = useState(false); + const [isPwrkCnsltnDocMngOpen, setIsPwrkCnsltnDocMngOpen] = useState(false); const isEditMode = mode === "edit"; const isSplmntPrgrsStts = initialData?.detDto?.prgrsSttsComCd === "SL"; + const fnrsCnsltnDocNo = initialData?.detDto?.fnrsCnsltnDocNo; const { data: masterSharTree = [] } = useFnrsSharSeMngTree(); const { data: acntgTree = [] } = useAcntgSeMngTree(); @@ -156,7 +159,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps) (item) => !item.splmntCn || !item.splmntCn.trim(), ); if (hasEmptySplmntCn) { - alert("보완요청내용이 있습니다. 보완완료내용을 입력해 주세요."); + alert("보완요청내용이 있습니다. 보완 완료내용을 입력해 주세요."); return; } @@ -171,12 +174,12 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps) const result = await submitSupplementForm(data); if (!result) return; - alert("보완완료 처리되었습니다."); + alert("보완 완료 처리되었습니다."); await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all }); router.push(`/fnrs-cnsltn/${docNo}`); } catch (error) { - console.error("보완완료 실패:", error); - alert("보완완료 처리 중 오류가 발생했습니다."); + console.error("보완 완료 실패:", error); + alert("보완 완료 처리 중 오류가 발생했습니다."); } finally { setIsSubmitting(false); } @@ -334,14 +337,32 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps) onClick={form.handleSubmit(onSplmntCmptn)} disabled={isSubmitting} > - 보완완료 + 보완 완료 )} + {isSplmntPrgrsStts && fnrsCnsltnDocNo ? ( + + ) : null} + {fnrsCnsltnDocNo ? ( + setIsPwrkCnsltnDocMngOpen(false)} + /> + ) : null} ); } 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 caa4a3ada..837a97239 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 @@ -136,8 +136,7 @@ const TechReviewOpinionSection = forwardRef< const kecoRvwList = rvwList.filter((item) => item.opnrSeComCd === "KECO"); const hasEnvSection = envRvwList.length > 0 || editableReviewStep === "ENV"; - const hasKecoSection = - kecoRvwList.length > 0 || (editableReviewStep === "KECO" && canWriteKecoOpinion); + const hasKecoSection = kecoRvwList.length > 0 || editableReviewStep === "KECO"; if (!hasEnvSection && !hasKecoSection) { return null; diff --git a/apps/as/src/shared/model/pbadms-sprt.ts b/apps/as/src/shared/model/pbadms-sprt.ts index 77a346522..959c8133d 100644 --- a/apps/as/src/shared/model/pbadms-sprt.ts +++ b/apps/as/src/shared/model/pbadms-sprt.ts @@ -54,9 +54,9 @@ export interface BizCstTreeDto { bscPlanAmt: number; /** 금회설계금액(C) */ tstmDesignAmt: number; - /** 증감금액(금회설계금액 - 표준사업비, C-B) */ + /** 증감금액(금회설계금액 - 예산반영금액, C-A) */ chgAmt: number; - /** 증감율 % ((증감금액 / 표준사업비) * 100) */ + /** 증감율 % ((증감금액 / 예산반영금액(A)) * 100) */ chgRt: number; } diff --git a/apps/as/src/widgets/pbadms-sprt/lib/fnrs-shar-form-utils.ts b/apps/as/src/widgets/pbadms-sprt/lib/fnrs-shar-form-utils.ts index 4700fdac1..d593d4aee 100644 --- a/apps/as/src/widgets/pbadms-sprt/lib/fnrs-shar-form-utils.ts +++ b/apps/as/src/widgets/pbadms-sprt/lib/fnrs-shar-form-utils.ts @@ -122,7 +122,7 @@ function findBizCstSyncItem(costItems: CostItemDef[]): CostItemDef | undefined { } export interface BizCstTotalAmounts { - bscPlanAmt: number; + bgtRfltAmt: number; tstmDesignAmt: number; } @@ -136,13 +136,13 @@ export function getBizCstTotalRow( costItems: CostItemDef[], ): BizCstTotalAmounts { const syncCostItem = findBizCstSyncItem(costItems); - if (!syncCostItem) return { bscPlanAmt: 0, tstmDesignAmt: 0 }; + if (!syncCostItem) return { bgtRfltAmt: 0, tstmDesignAmt: 0 }; const costRow = bizCstList.find((item) => item.acntgSeCd === syncCostItem.code); - if (!costRow) return { bscPlanAmt: 0, tstmDesignAmt: 0 }; + if (!costRow) return { bgtRfltAmt: 0, tstmDesignAmt: 0 }; return { - bscPlanAmt: costRow.bscPlanAmt || 0, + bgtRfltAmt: costRow.bgtRfltAmt || 0, tstmDesignAmt: costRow.tstmDesignAmt || 0, }; } @@ -178,7 +178,7 @@ export function calcBizCstSharRemaining( const leafSum = sumFnrsSharLeafAmounts(sharList, sharItems); return { - exstnRemaining: roundAmount(bizCstTotal.bscPlanAmt - leafSum.exstnAmt), + exstnRemaining: roundAmount(bizCstTotal.bgtRfltAmt - leafSum.exstnAmt), chgRqtRemaining: roundAmount(bizCstTotal.tstmDesignAmt - leafSum.chgRqtAmt), }; } diff --git a/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx b/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx index 15ff2a413..dc50504a5 100644 --- a/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx +++ b/apps/as/src/widgets/pbadms-sprt/ui/business-cost-form-section.tsx @@ -104,7 +104,7 @@ function BusinessCostFormSection() { const data = bizCstList[idx]; if (!data) return null; - const diff = (data.tstmDesignAmt || 0) - (data.bscPlanAmt || 0); + const diff = (data.tstmDesignAmt || 0) - (data.bgtRfltAmt || 0); const paddingLeft = `${item.level * 1.6}rem`; const showSubIcon = item.level >= 2; @@ -120,14 +120,14 @@ function BusinessCostFormSection() { ( handleCostChange(idx, "bscPlanAmt", e.target.value)} + onChange={(e) => handleCostChange(idx, "bgtRfltAmt", e.target.value)} readOnly={item.readonly} aria-invalid={fieldState.invalid} className={`text-right ${item.readonly ? "bg-muted" : ""}`} @@ -138,14 +138,14 @@ function BusinessCostFormSection() { ( handleCostChange(idx, "bgtRfltAmt", e.target.value)} + onChange={(e) => handleCostChange(idx, "bscPlanAmt", e.target.value)} readOnly={item.readonly} aria-invalid={fieldState.invalid} className={`text-right ${item.readonly ? "bg-muted" : ""}`} diff --git a/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-dialog.tsx b/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-dialog.tsx index 752898721..2e225a286 100644 --- a/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-dialog.tsx +++ b/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-dialog.tsx @@ -199,7 +199,7 @@ function SplmntDmndDialog({ try { await attachService.deleteAttachmentByAtflId(atflId); } catch (error) { - console.error("보완요청 첨부파일 삭제 실패:", error); + console.error("보완 요청 첨부파일 삭제 실패:", error); } } @@ -226,7 +226,7 @@ function SplmntDmndDialog({ - 보완요청 + 보완 요청
@@ -322,7 +322,7 @@ function SplmntDmndDialog({ 취소