Browse Source

feat/추가 요구 사항 추가

master
sanguu516 3 weeks ago
parent
commit
482867f246
  1. 43
      src/components/flight/ControlApprovalsTable.js
  2. 79
      src/components/flight/NewFlightApprovalsReport.js
  3. 9
      src/components/flight/OperationApprovalsTable.js
  4. 22
      src/configs/constants.ts

43
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')}</>
) : (
<Button color='flat-dark' onClick={() => handleIsModal(record)}>
<>
재검토
<br />
사유보기
</>
</Button>
);
}
},
// {
// title: <>안전운항과</>,
// dataIndex: 'reviewedType',
// align: 'center',
// width: '130px',
// render: (reviewedType, record) => {
// return reviewedType !== 'R' ? (
// <>{handlerReviewed(reviewedType, 'operation')}</>
// ) : (
// <Button color='flat-dark' onClick={() => handleIsModal(record)}>
// <>
// 재검토
// <br />
// 사유보기
// </>
// </Button>
// );
// }
// },
{
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,

79
src/components/flight/NewFlightApprovalsReport.js

@ -170,45 +170,48 @@ export default function NewFlightApprovalsReport(props) {
</FormGroup>
</div>
</div>
<div className='list-input'>
<div className='layer-content'>
<FormGroup>
<Label for='searchDate'>
{props.pageName === 'control' ? '안전운항과' : '관제통신과'}
</Label>
<CustomInput
type='select'
bsSize='sm'
id={
props.pageName === 'control'
? 'reviewedType'
: 'reviewedProcType'
}
value={
props.pageName === 'control'
? props.reviewedType
: props.reviewedProcType
}
onChange={e => {
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]) => (
<option key={key} value={key}>
{value}
</option>
))}
</CustomInput>
</FormGroup>
{props.pageName !== 'control' && (
<div className='list-input'>
<div className='layer-content'>
<FormGroup>
<Label for='searchDate'>
{props.pageName === 'control' ? '안전운항과' : '관제통신과'}
</Label>
<CustomInput
type='select'
bsSize='sm'
id={
props.pageName === 'control'
? 'reviewedType'
: 'reviewedProcType'
}
value={
props.pageName === 'control'
? props.reviewedType
: props.reviewedProcType
}
onChange={e => {
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]) => (
<option key={key} value={key}>
{value}
</option>
))}
</CustomInput>
</FormGroup>
</div>
</div>
</div>
)}
<div className='list-input'>
<div className='layer-content'>
<FormGroup>

9
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',

22
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: '검토요청처리'
}
};

Loading…
Cancel
Save