From 46350767dc9cc460af1d2e978d89bb9ca990df90 Mon Sep 17 00:00:00 2001 From: JANGHYUNn Date: Fri, 26 Jul 2024 10:43:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EC=8A=B9?= =?UTF-8?q?=EC=9D=B8=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/controlRightMenuContainer.js | 17 ++++++++++++++--- src/containers/rightMenuContainer.js | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/containers/controlRightMenuContainer.js b/src/containers/controlRightMenuContainer.js index ea4c0b34..6e03f15d 100644 --- a/src/containers/controlRightMenuContainer.js +++ b/src/containers/controlRightMenuContainer.js @@ -76,8 +76,12 @@ function ControlRightMenuContainer() { setEndDate(searchDate.endDate); setFilter(search); if ( - search != '' && - (search === '승인' || search === '미승인' || search === '비대상') + search !== '' && + (search === '승인' || + search === '미승인' || + search === '비대상' || + search === '조건부승인' || + search === '조건부 승인') ) { dispatch( getLaancAprvList({ @@ -86,7 +90,14 @@ function ControlRightMenuContainer() { ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, sig: filterArea.sig === '전체' ? '' : filterArea.sig, address: filterArea.address, - approvalCd: search === '승인' ? 'S' : search === '미승인' ? 'F' : 'U' + approvalCd: + search === '승인' + ? 'S' + : search === '미승인' + ? 'F' + : search === '조건부승인' || search === '조건부 승인' + ? 'C' + : 'U' }) ); } else if (search != '') { diff --git a/src/containers/rightMenuContainer.js b/src/containers/rightMenuContainer.js index fd20e441..475070a7 100644 --- a/src/containers/rightMenuContainer.js +++ b/src/containers/rightMenuContainer.js @@ -96,7 +96,11 @@ function RightMenuContainer() { setFilter(search); if ( search !== '' && - (search === '승인' || search === '미승인' || search === '비대상') + (search === '승인' || + search === '미승인' || + search === '비대상' || + search === '조건부승인' || + search === '조건부 승인') ) { dispatch( getLaancAprvList({ @@ -105,7 +109,14 @@ function RightMenuContainer() { ctprvn: filterArea.ctprvn === '전체' ? '' : filterArea.ctprvn, sig: filterArea.sig === '전체' ? '' : filterArea.sig, address: filterArea.address, - approvalCd: search === '승인' ? 'S' : search === '미승인' ? 'F' : 'U' + approvalCd: + search === '승인' + ? 'S' + : search === '미승인' + ? 'F' + : search === '조건부승인' || search === '조건부 승인' + ? 'C' + : 'U' }) ); } else if (search != '') {