diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 4b38ddf2..8060670c 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -1220,8 +1220,10 @@ caption {overflow: hidden; line-height: 0;text-indent: -2000px;} .input-n .list-input.list-input-btn .btn{width:100%;min-height:34px} .input-n .list-input + .list-input{margin-left:0.5rem} -.search-download{display:flex;justify-content: space-between;align-items: baseline;margin-bottom:0.5rem} +.search-download{display:flex;justify-content: space-between;align-items: baseline;flex-direction: column;} .search-download .search-case{margin-left:0;} +.search-download .download{width:100%;display:flex;margin-bottom:0.5rem;margin-top:0.5rem} +.search-download .download button{flex: 1; display: flex;text-align: center;align-items: center;justify-content: center;} .search-download .download button + button{margin-left:0.5rem} /*new approval table*/ diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 20fe641b..47fa0398 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -89,6 +89,7 @@ export default function ControlApprovalsTable(props) { era: record.era, rm: record.rm, reqRadius: record.reqRadius, + reqElev: record.reqElev, ...record }); setEditingKey(record.key); @@ -114,7 +115,8 @@ export default function ControlApprovalsTable(props) { dtl: row.dtl || '', era: row.era || '', rm: row.rm || '', - reqRadius: row.reqRadius || '' + reqRadius: row.reqRadius || '', + reqElev: row.reqElev || '' } ]) ); @@ -549,7 +551,7 @@ export default function ControlApprovalsTable(props) { areaList[0].reviewedType === 'R' ? ( '검토완료' ) : areaList[0].reviewedType === 'C' ? ( - '검토요청취소' + '요청반려' ) : areaList[0].reviewedType === 'Q' ? ( '검토요청' ) : areaList[0].reviewedType === 'A' ? ( @@ -702,6 +704,7 @@ export default function ControlApprovalsTable(props) { dataIndex: 'reqElev', align: 'center', width: '80px', + editable: true, render: text => { return text ? text : <>-; } @@ -819,7 +822,7 @@ export default function ControlApprovalsTable(props) { return text === 'R' ? ( '검토완료' ) : text === 'C' ? ( - '검토요청취소' + '요청반려' ) : text === 'Q' ? ( '검토요청' ) : text === 'A' ? ( @@ -852,6 +855,7 @@ export default function ControlApprovalsTable(props) { fltElev: item.fltElev, rm: item.rm, era: item.era, + reqElev: item.reqElev, reqRadius: item.reqRadius, allowRadius: item.allowRadius, fltElevMax: item.fltElevMax, @@ -1242,7 +1246,7 @@ export default function ControlApprovalsTable(props) { const checkCondition = type === 'R' ? item => item.reviewedType !== 'Q' - : item => item.reviewedType !== 'R'; + : item => item.reviewedType !== 'Q'; // 에러 메시지 const errorMessages = { @@ -1297,6 +1301,7 @@ export default function ControlApprovalsTable(props) { 건 +
+