From 3240fc8e1edffdc409723ba35400d84cf42f0599 Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Wed, 31 Jul 2024 11:48:09 +0900 Subject: [PATCH] =?UTF-8?q?feat/=EA=B2=80=EC=83=89=EC=B0=BD=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/ControlApprovalsContainer.js | 24 ++++++++++++------- .../flight/OperationApprovalsContainer.js | 24 ++++++++++++------- src/redux/features/laanc/laancState.ts | 1 + 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 39347884..39dbf579 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -232,6 +232,21 @@ export default function ControlApprovalsContainer({ mode }) { setPopup(popupRef.current); }; + const checkSearch = text => { + switch (text) { + case '승인': + return 'S'; + case '미승인': + return 'F'; + case '비대상': + return 'U'; + case '조건부승인': + return 'C'; + case '조건부 승인': + return 'C'; + } + }; + const handlerSearch = (search, searchDate, filterArea) => { setStartDate(searchDate.startDate); setEndDate(searchDate.endDate); @@ -251,14 +266,7 @@ export default function ControlApprovalsContainer({ mode }) { ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, sig: filterArea.sig === '전체' ? '' : filterArea.sig, address: filterArea.address, - approvalCd: - search === '승인' - ? 'S' - : search === '미승인' - ? 'F' - : search === '조건부승인' || search === '조건부 승인' - ? 'C' - : 'U' + approvalCd: checkSearch(search) }) ); } else if (search != '') { diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index c8f287c0..702d929f 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -276,6 +276,21 @@ export default function OperationApprovalsContainer({ mode }) { setPopup(popupRef.current); }; + const checkSearch = text => { + switch (text) { + case '승인': + return 'S'; + case '미승인': + return 'F'; + case '비대상': + return 'U'; + case '조건부승인': + return 'C'; + case '조건부 승인': + return 'C'; + } + }; + const handlerSearch = (search, searchDate, filterArea) => { setStartDate(searchDate.startDate); setEndDate(searchDate.endDate); @@ -295,14 +310,7 @@ export default function OperationApprovalsContainer({ mode }) { ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, sig: filterArea.sig === '전체' ? '' : filterArea.sig, address: filterArea.address, - approvalCd: - search === '승인' - ? 'S' - : search === '미승인' - ? 'F' - : search === '조건부승인' || search === '조건부 승인' - ? 'C' - : 'U' + approvalCd: checkSearch(search) }) ); } else if (search != '') { diff --git a/src/redux/features/laanc/laancState.ts b/src/redux/features/laanc/laancState.ts index 29f9872c..b4004d96 100644 --- a/src/redux/features/laanc/laancState.ts +++ b/src/redux/features/laanc/laancState.ts @@ -633,6 +633,7 @@ export interface ILaancAprvListRq { approvalCd: string; ctprvn?: string; sig?: string; + reviewedType?: string; adress?: string; }