diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js index a305621c..e34e1ad1 100644 --- a/src/components/flight/NewFlightApprovalsReport.js +++ b/src/components/flight/NewFlightApprovalsReport.js @@ -1,5 +1,6 @@ import { useState, useEffect, useRef } from 'react'; import Flatpickr from 'react-flatpickr'; +import { Collapse, ConfigProvider } from 'antd'; import { Button, Input, @@ -53,276 +54,302 @@ export default function NewFlightApprovalsReport(props) { }; return ( - <> -
-
+ +
+ +

비행승인 신청 검토결과 현황

+
+ ), + children: ( + <> +
+ {/*

비행승인 신청 검토결과 현황

-
+
*/} -
-
-
- - -
- { - setSearchDate({ - startDate: dayjs(date[0]).format('YYYY-MM-DD'), - endDate: dayjs(date[1]).format('YYYY-MM-DD') - }); - }} - className='form-control flat-picker bg-transparent border-0 shadow-none' - /> - -
-
-
-
+
+
+
+ + +
+ { + setSearchDate({ + startDate: dayjs(date[0]).format( + 'YYYY-MM-DD' + ), + endDate: dayjs(date[1]).format('YYYY-MM-DD') + }); + }} + className='form-control flat-picker bg-transparent border-0 shadow-none' + /> + +
+
+
+
-
-
- - - props.setFilterId(e.target.value)} - onKeyPress={handleKeyDown} - /> - -
-
+
+
+ + props.setFilterId(e.target.value)} + onKeyPress={handleKeyDown} + /> + +
+
-
-
- - - - props.setCheckState({ - ...props.checkState, - limitZoneNm: e.target.value - }) - } - onKeyPress={handleKeyDown} - value={props.checkState.limitZoneNm} - > - - - - - -
-
-
-
-
-
-

확인 결과

-
-
-
-
- - - { - props.pageName === 'control' - ? props.setCheckState({ - ...props.checkState, - reviewedProcType: e.target.value - }) - : props.setCheckState({ - ...props.checkState, - reviewedType: e.target.value - }); - }} - onKeyPress={handleKeyDown} - > - {Object.entries( - props.pageName === 'control' - ? FlightCategory.Control - : FlightCategory.Operation - ).map(([key, value]) => ( - - ))} - - -
-
- {props.pageName !== 'control' && ( -
-
- - - { - props.pageName === 'control' - ? props.setCheckState({ - ...props.checkState, - reviewedType: e.target.value - }) - : props.setCheckState({ - ...props.checkState, - reviewedProcType: e.target.value - }); - }} - onKeyPress={handleKeyDown} - > - {Object.entries( - props.pageName === 'control' - ? FlightCategory.Operation - : FlightCategory.Control - ).map(([key, value]) => ( - - ))} - - -
-
- )} +
+
+ + + props.setCheckState({ + ...props.checkState, + limitZoneNm: e.target.value + }) + } + onKeyPress={handleKeyDown} + value={props.checkState.limitZoneNm} + > + + + + + +
+
+
+
+
+
+
+
+ + { + props.pageName === 'control' + ? props.setCheckState({ + ...props.checkState, + reviewedProcType: e.target.value + }) + : props.setCheckState({ + ...props.checkState, + reviewedType: e.target.value + }); + }} + onKeyPress={handleKeyDown} + > + {Object.entries( + props.pageName === 'control' + ? FlightCategory.Control + : FlightCategory.Operation + ).map(([key, value]) => ( + + ))} + + +
+
+ {props.pageName !== 'control' && ( +
+
+ + { + props.pageName === 'control' + ? props.setCheckState({ + ...props.checkState, + reviewedType: e.target.value + }) + : props.setCheckState({ + ...props.checkState, + reviewedProcType: e.target.value + }); + }} + onKeyPress={handleKeyDown} + > + {Object.entries( + props.pageName === 'control' + ? FlightCategory.Operation + : FlightCategory.Control + ).map(([key, value]) => ( + + ))} + + +
+
+ )} -
-
- - - - - - - - -
-
-
-
-
-
-

신청구역

-
-
-
- - props.setFilterArea({ - ...props.filterArea, - ctprvn: e.target.value, - sig: '전체' - }) - } - > - {Object.values(CityCategories).map(city => ( - - ))} - -
-
- - props.setFilterArea({ - ...props.filterArea, - sig: e.target.value - }) - } - > - {DistrictCategories[props.pageName][props.filterArea.ctprvn]?.map( - district => ( - - ) - )} - -
-
- - props.setFilterArea({ - ...props.filterArea, - address: e.target.value - }) - } - onKeyPress={handleKeyDown} - /> -
-
- -
-
+
+
+ + + + + + + +
+
+
+
+
+
+

신청구역

+
+
+
+ + props.setFilterArea({ + ...props.filterArea, + ctprvn: e.target.value, + sig: '전체' + }) + } + > + {Object.values(CityCategories).map(city => ( + + ))} + +
+
+ + props.setFilterArea({ + ...props.filterArea, + sig: e.target.value + }) + } + > + {DistrictCategories[props.pageName][ + props.filterArea.ctprvn + ]?.map(district => ( + + ))} + +
+
+ + props.setFilterArea({ + ...props.filterArea, + address: e.target.value + }) + } + onKeyPress={handleKeyDown} + /> +
+
+ +
+
+
+ + ) + } + ]} + />
- + ); } diff --git a/src/configs/constants.ts b/src/configs/constants.ts index cdad17f3..0a8610a8 100644 --- a/src/configs/constants.ts +++ b/src/configs/constants.ts @@ -237,7 +237,7 @@ export type DistrictCategory = // 비행 확인 상태 export const FlightCategory = { Control: { - 전체: '전체', + 전체: '관제통신과', W: '검토대기', P: '검토완료' // R: '재검토', @@ -245,7 +245,7 @@ export const FlightCategory = { // P: '요청처리' }, Operation: { - 전체: '전체', + 전체: '안전운항과', P: '검토완료', W: '검토대기', Q: '검토요청'