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 != '') {