From 5e8f014f9ba64634adf4b3419bf98ea9d5844d3e Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Wed, 4 Sep 2024 16:35:22 +0900 Subject: [PATCH] =?UTF-8?q?feat/=EC=A0=84=EC=86=A1=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/flight/ControlApprovalsTable.js | 4 ++++ src/components/flight/NewFlightApprovalsReport.js | 15 +++++++++++---- .../flight/ControlApprovalsContainer.js | 5 ++++- .../popup/ControlApprovalsPopupContainer.js | 5 ++++- src/redux/features/laanc/laancState.ts | 2 ++ 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 69d6c340..6a711bcc 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -721,6 +721,10 @@ export default function ControlApprovalsTable(props) { props.checkState.limitZoneNm === '전체' ? null : props.checkState.limitZoneNm, + sendProcStatus: + props.checkState.sendProcStatus === '전체' + ? null + : checkState.sendProcStatus, adress: props.filterArea.address === '전체' ? null : props.filterArea.address }; diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js index c53f26a9..ff0d791e 100644 --- a/src/components/flight/NewFlightApprovalsReport.js +++ b/src/components/flight/NewFlightApprovalsReport.js @@ -248,11 +248,18 @@ export default function NewFlightApprovalsReport(props) { + props.setCheckState({ + ...props.checkState, + sendProcStatus: e.target.value + }) + } + value={props.checkState.sendProcStatus} > - - - + + + diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index f23b1438..1e00cc4f 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -65,7 +65,8 @@ export default function ControlApprovalsContainer({ mode }) { const [checkState, setCheckState] = useState({ reviewedType: '전체', reviewedProcType: '전체', - limitZoneNm: '전체' + limitZoneNm: '전체', + sendProcStatus: '전체' }); // 지역 const [filterArea, setFilterArea] = useState({ @@ -240,6 +241,8 @@ export default function ControlApprovalsContainer({ mode }) { ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, + sendProcStatus: + checkState.sendProcStatus === '전체' ? '' : checkState.sendProcStatus, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm, ...(search !== '' ? { applyNo: search } : {}), diff --git a/src/containers/flight/popup/ControlApprovalsPopupContainer.js b/src/containers/flight/popup/ControlApprovalsPopupContainer.js index 3c0e7859..1fda3076 100644 --- a/src/containers/flight/popup/ControlApprovalsPopupContainer.js +++ b/src/containers/flight/popup/ControlApprovalsPopupContainer.js @@ -26,7 +26,8 @@ function ControlApprovalsPopupContainer() { const [checkState, setCheckState] = useState({ reviewedType: '전체', reviewedProcType: '전체', - limitZoneNm: '전체' + limitZoneNm: '전체', + sendProcStatus: '전체' }); const dispatch = useDispatch(); @@ -102,6 +103,8 @@ function ControlApprovalsPopupContainer() { ctprvn: filterArea.ctprvn === '시/도' ? '' : filterArea.ctprvn, sig: filterArea.sig === '군/구' ? '' : filterArea.sig, address: filterArea.address, + sendProcStatus: + checkState.sendProcStatus === '전체' ? '' : checkState.sendProcStatus, limitZoneCd: checkState.limitZoneNm === '전체' ? '' : checkState.limitZoneNm, ...(search !== '' ? { applyNo: search } : {}), diff --git a/src/redux/features/laanc/laancState.ts b/src/redux/features/laanc/laancState.ts index dc162d92..0ca3b6e2 100644 --- a/src/redux/features/laanc/laancState.ts +++ b/src/redux/features/laanc/laancState.ts @@ -39,6 +39,7 @@ export interface ILaancAprvParam { applyNo?: string; reviewedType?: string; reviewedProcType?: string; + sendProcStatus?: string; } export interface IweatherRs { @@ -649,6 +650,7 @@ export interface ILaancAprvListRq { sig?: string; reviewedType?: string; adress?: string; + sendProcStatus?: string; } export interface ILaancAprvListRs {