diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 107affb1..51700a21 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -528,25 +528,25 @@ export default function ControlApprovalsTable(props) { ); } }, - { - title: <>안전운항과, - dataIndex: 'reviewedType', - align: 'center', - width: '130px', - render: (reviewedType, record) => { - return reviewedType !== 'R' ? ( - <>{handlerReviewed(reviewedType, 'operation')} - ) : ( - - ); - } - }, + // { + // title: <>안전운항과, + // dataIndex: 'reviewedType', + // align: 'center', + // width: '130px', + // render: (reviewedType, record) => { + // return reviewedType !== 'R' ? ( + // <>{handlerReviewed(reviewedType, 'operation')} + // ) : ( + // + // ); + // } + // }, { title: ( <> @@ -915,6 +915,11 @@ export default function ControlApprovalsTable(props) { } }} dataSource={laancAprvList + .filter( + i => + i.applyDt !== '2024-08-26' && + i.applyDt !== '2024-08-27' + ) .map((item, index) => item.areaList.map((area, index) => ({ ...area, diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js index 52173ca8..dd709bd8 100644 --- a/src/components/flight/NewFlightApprovalsReport.js +++ b/src/components/flight/NewFlightApprovalsReport.js @@ -170,45 +170,48 @@ export default function NewFlightApprovalsReport(props) { -
-
- - - { - props.pageName === 'control' - ? props.setReviewedType(e.target.value) - : props.setReviewedProcType(e.target.value); - }} - onKeyPress={handleKeyDown} - > - {Object.entries( - props.pageName === 'control' - ? FlightCategory.Operation - : FlightCategory.Control - ).map(([key, value]) => ( - - ))} - - + {props.pageName !== 'control' && ( +
+
+ + + { + props.pageName === 'control' + ? props.setReviewedType(e.target.value) + : props.setReviewedProcType(e.target.value); + }} + onKeyPress={handleKeyDown} + > + {Object.entries( + props.pageName === 'control' + ? FlightCategory.Operation + : FlightCategory.Control + ).map(([key, value]) => ( + + ))} + + +
-
+ )} +
diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js index 34eb40ab..c03e4ce5 100644 --- a/src/components/flight/OperationApprovalsTable.js +++ b/src/components/flight/OperationApprovalsTable.js @@ -422,6 +422,15 @@ export default function OperationApprovalsTable(props) { return weightNm ?? '-'; } }, + { + title: <>기체용도, + dataIndex: 'benefit', + align: 'center', + width: '90px', + render: (benefit, record) => { + return benefit === 'Y' ? '영리' : '비영리'; + } + }, { title: <>비행 목적, dataIndex: 'purpose', diff --git a/src/configs/constants.ts b/src/configs/constants.ts index 59461179..49d1df39 100644 --- a/src/configs/constants.ts +++ b/src/configs/constants.ts @@ -238,21 +238,21 @@ export type DistrictCategory = export const FlightCategory = { Control: { 전체: '전체', - S: '완료', W: '검토대기', - R: '재검토', - C: '검토취소', - P: '요청처리' + S: '검토완료' + // R: '재검토', + // C: '검토취소', + // P: '요청처리' }, Operation: { 전체: '전체', - S: '완료', - Q: '검토요청', - R: '재검토요청', - W: '대기', - U: '불필요', - C: '검토요청취소', - P: '검토요청처리' + S: '검토완료', + W: '검토대기', + Q: '검토요청' + // R: '재검토요청', + // U: '불필요', + // C: '검토요청취소', + // P: '검토요청처리' } };