Browse Source

fix/추가 요구사항 수정

master
sanguu516 4 weeks ago
parent
commit
6b90cd4721
  1. 65
      src/components/flight/ControlApprovalsTable.js
  2. 2
      src/components/flight/NewFlightApprovalsReport.js
  3. 35
      src/components/flight/OperationApprovalsTable.js

65
src/components/flight/ControlApprovalsTable.js

@ -433,13 +433,7 @@ export default function ControlApprovalsTable(props) {
} }
}, },
{ {
title: ( title: <>검토 결과</>,
<>
LAANC
<br />
검토 결과
</>
),
dataIndex: 'approvalCd', dataIndex: 'approvalCd',
align: 'center', align: 'center',
width: '140px', width: '140px',
@ -458,13 +452,7 @@ export default function ControlApprovalsTable(props) {
} }
}, },
{ {
title: ( title: <>관제통신과</>,
<>
관제과
<br />
확인결과
</>
),
dataIndex: 'reviewedProcType', dataIndex: 'reviewedProcType',
align: 'center', align: 'center',
width: '130px', width: '130px',
@ -507,33 +495,25 @@ export default function ControlApprovalsTable(props) {
); );
} }
}, },
{ // {
title: ( // title: <>안전운항과</>,
<> // dataIndex: 'reviewedType',
운항과 // align: 'center',
<br /> // width: '130px',
확인 // render: (reviewedType, record) => {
<br /> // return reviewedType !== 'R' ? (
결과 // <>{handlerReviewed(reviewedType, 'operation')}</>
</> // ) : (
), // <Button color='flat-dark' onClick={() => handleIsModal(record)}>
dataIndex: 'reviewedType', // <>
align: 'center', // 재검토
width: '130px', // <br />
render: (reviewedType, record) => { // 사유보기
return reviewedType !== 'R' ? ( // </>
<>{handlerReviewed(reviewedType, 'operation')}</> // </Button>
) : ( // );
<Button color='flat-dark' onClick={() => handleIsModal(record)}> // }
<> // },
재검토
<br />
사유보기
</>
</Button>
);
}
},
{ {
title: ( title: (
<> <>
@ -945,6 +925,9 @@ export default function ControlApprovalsTable(props) {
scroll={{ scroll={{
x: 1700 x: 1700
}} }}
pagination={{
position: ['bottomLeft']
}}
rowHoverable={false} rowHoverable={false}
expandIconColumnIndex={-1} expandIconColumnIndex={-1}
onChange={(pagination, filters, sorter, extra) => { onChange={(pagination, filters, sorter, extra) => {

2
src/components/flight/NewFlightApprovalsReport.js

@ -225,7 +225,7 @@ export default function NewFlightApprovalsReport(props) {
</div> </div>
<div className='layer-content'> <div className='layer-content'>
<div className='layer-ti'> <div className='layer-ti'>
<h4></h4> <h4>신청구</h4>
</div> </div>
<div className='input-n'> <div className='input-n'>
<div className='list-input'> <div className='list-input'>

35
src/components/flight/OperationApprovalsTable.js

@ -443,13 +443,7 @@ export default function OperationApprovalsTable(props) {
} }
}, },
{ {
title: ( title: <>안전운항과</>,
<>
운항과
<br />
확인결과
</>
),
dataIndex: 'reviewedType', dataIndex: 'reviewedType',
align: 'center', align: 'center',
width: '130px', width: '130px',
@ -496,13 +490,7 @@ export default function OperationApprovalsTable(props) {
} }
}, },
{ {
title: ( title: <>관제통신과</>,
<>
관제과
<br />
확인결과
</>
),
dataIndex: 'reviewedProcType', dataIndex: 'reviewedProcType',
align: 'center', align: 'center',
width: '130px', width: '130px',
@ -525,18 +513,6 @@ export default function OperationApprovalsTable(props) {
return Math.random() < 0.5 ? '전송' : '미전송'; return Math.random() < 0.5 ? '전송' : '미전송';
} }
}, },
{
title: (
<>
재검토 <br />
사유
</>
),
dataIndex: 'reviewedReason',
width: '70px',
align: 'center',
render: reviewedReason => reviewedReason ?? '-'
},
{ {
title: '비고', title: '비고',
dataIndex: 'planAreaSno', dataIndex: 'planAreaSno',
@ -860,9 +836,9 @@ export default function OperationApprovalsTable(props) {
<Button color='primary' size='sm' onClick={() => handleCheckbox('Q')}> <Button color='primary' size='sm' onClick={() => handleCheckbox('Q')}>
검토 요청 검토 요청
</Button> </Button>
<Button color='primary' size='sm' onClick={() => handleCheckbox('A')}> {/* <Button color='primary' size='sm' onClick={() => handleCheckbox('A')}>
요청 요청
</Button> </Button> */}
<Button color='primary' size='sm' onClick={() => handleCheckbox('A')}> <Button color='primary' size='sm' onClick={() => handleCheckbox('A')}>
드론 원스톱 전송 드론 원스톱 전송
</Button> </Button>
@ -952,6 +928,9 @@ export default function OperationApprovalsTable(props) {
onChange={(pagination, filters, sorter, extra) => { onChange={(pagination, filters, sorter, extra) => {
handlePageChange(); handlePageChange();
}} }}
pagination={{
position: ['bottomLeft']
}}
/> />
</Form> </Form>
</div> </div>

Loading…
Cancel
Save