From 87e7d3bed157603795a830df5ab8b5b69a4d3281 Mon Sep 17 00:00:00 2001
From: sanguu516 <sanguu516@naver.com>
Date: Thu, 27 Jun 2024 18:44:05 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EB=B9=84?=
 =?UTF-8?q?=ED=96=89=20=EC=8A=B9=EC=9D=B8=20=EA=B2=80=EC=83=89=20=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=20=EB=B0=8F=20=ED=8C=9D=EC=97=85=20=EB=AC=B8=EA=B5=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/flight/NewFlightApprovalsTable.js   | 11 ++++++++++-
 .../flight/NewFlightApprovalsContainer.js          | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/flight/NewFlightApprovalsTable.js b/src/components/flight/NewFlightApprovalsTable.js
index fc213d36..9413843c 100644
--- a/src/components/flight/NewFlightApprovalsTable.js
+++ b/src/components/flight/NewFlightApprovalsTable.js
@@ -75,7 +75,6 @@ export default function NewFlightApprovalsTable(props) {
 
   // 수정 이벤트
   const edit = record => {
-    console.log('planAreaSno>>>', record.planAreaSno);
     form.setFieldsValue({
       planAreaSno: record.planAreaSno,
       bufferZone: record.bufferZone,
@@ -814,6 +813,16 @@ export default function NewFlightApprovalsTable(props) {
           type: 'success'
         })
       );
+    } else if (approval === 'C') {
+      dispatch(
+        openModal({
+          header: '조건부 승인',
+          body: `관제권 내 조건부 승인(신청고도${fltElev}m/허용고도${
+            fltElevMax === undefined ? 150 : fltElevMax
+          }m) 입니다.`,
+          type: 'warning'
+        })
+      );
     } else {
       dispatch(
         openModal({
diff --git a/src/containers/flight/NewFlightApprovalsContainer.js b/src/containers/flight/NewFlightApprovalsContainer.js
index 137c2a0b..7a9a2ae0 100644
--- a/src/containers/flight/NewFlightApprovalsContainer.js
+++ b/src/containers/flight/NewFlightApprovalsContainer.js
@@ -209,14 +209,24 @@ export default function NewFlightApprovalsContainer({ mode }) {
 
     if (
       search != '' &&
-      (search === '승인' || search === '미승인' || search === '비대상')
+      (search === '승인' ||
+        search === '미승인' ||
+        search === '비대상' ||
+        search === '조건부승인')
     ) {
       dispatch(
         getLaancAprvList({
           searchStDt: searchDate.startDate,
           searchEndDt: searchDate.endDate,
           selectZone: filterArea,
-          approvalCd: search === '승인' ? 'S' : search === '미승인' ? 'F' : 'U'
+          approvalCd:
+            search === '승인'
+              ? 'S'
+              : search === '미승인'
+              ? 'F'
+              : search === '조건부승인'
+              ? 'C'
+              : 'U'
         })
       );
     } else if (search != '') {