diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 14365ccf..3f767440 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -1,5 +1,6 @@ import React, { useEffect, useState, useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; +import { ConfigProvider } from 'antd'; import { Button, Card } from '@component/ui'; import { openModal } from '@src/redux/features/comn/message/messageSlice'; import { FaAngleDown, FaAngleUp } from 'react-icons/fa'; @@ -482,6 +483,16 @@ export default function ControlApprovalsTable(props) { } ]; + const handleIsModal = record => { + dispatch( + openModal({ + header: '재검토 사유', + body: record.reviewedReason, + type: 'review' + }) + ); + }; + const handleSave = async row => { try { const updateRes = await dispatch( @@ -775,169 +786,183 @@ export default function ControlApprovalsTable(props) { }; return ( -
-
-
-

비행승인 신청 검토결과 목록

-
-
-
-
- - {`${formatDate(props.startDate)} `} - {props.endDate && props.startDate !== props.endDate - ? '~' + formatDate(props.endDate) + ' ' - : null} - 총 - {approvalCdValue.S + - approvalCdValue.F + - approvalCdValue.U + - approvalCdValue.C} - 건 - + +
+
+
+

비행승인 신청 검토결과 목록

+
+
+
+ + {`${formatDate(props.startDate)} `} + {props.endDate && props.startDate !== props.endDate + ? '~' + formatDate(props.endDate) + ' ' + : null} + 총 + {approvalCdValue.S + + approvalCdValue.F + + approvalCdValue.U + + approvalCdValue.C} + 건 + +
-
- - {/* + {/* */} - - + + +
-
-
-
-
    -
  • 승인 {approvalCdValue.S}건
  • -
  • 미승인 {approvalCdValue.F}건
  • -
  • - 조건부 승인 {approvalCdValue.C}건 -
  • -
+
+
+
    +
  • 승인 {approvalCdValue.S}건
  • +
  • 미승인 {approvalCdValue.F}건
  • +
  • + 조건부 승인 {approvalCdValue.C}건 +
  • +
+
-
-
- -
- {laancAprvList?.length > 0 ? ( -
- -
- - - i.applyDt !== '2024-08-26' && - i.applyDt !== '2024-08-27' - ) - .map((item, index) => - item.areaList.map((area, index) => ({ - ...area, - key: `${area.planAreaSno}` - })) - ) - .flat()} - columns={mergedColumns} - rowClassName={record => { - let className = ''; - if (record?.approvalCd === 'S') { - className += 'flight-approval-row editable-row'; - } else if (record.approvalCd === 'F') { - className += 'flight-not-approval-row editable-row'; - } else if (record.approvalCd === 'C') { - className += - 'flight-condition-approval-row editable-row'; - } else className += 'editable-row'; - - if (props.selected?.length > 0) { - if (record.planAreaSno === props.selected[0]) { - className += ' flight-approval-row-click'; +
+ +
+ {laancAprvList?.length > 0 ? ( + + +
+ +
1) { - className += 'expanded-tr'; - } - return className; - }} - rowSelection={{ - ...rowSelection - }} - onRow={record => ({ - onClick: event => { - handleRowClick(record); - } - })} - loading={laancAprvLoading} - scroll={{ - x: 1700 - }} - pagination={{ - position: ['bottomLeft'] - }} - rowHoverable={false} - expandIconColumnIndex={-1} - onChange={(pagination, filters, sorter, extra) => { - handlePageChange(); - }} - /> - - - - {modal && ( - - modal.type === 'review' - ? updateReviewedType('P', currentPlanAreaSno) - : handleSave(modal.row) - } - color='primary' - /> - )} - - ) : ( -
-

비행승인 신청 건수가 없습니다.

-
- )} - - + }} + dataSource={laancAprvList + .filter( + i => + i.applyDt !== '2024-08-26' && + i.applyDt !== '2024-08-27' + ) + .map((item, index) => + item.areaList.map((area, index) => ({ + ...area, + key: `${area.planAreaSno}` + })) + ) + .flat()} + columns={mergedColumns} + rowClassName={record => { + let className = ''; + if (record?.approvalCd === 'S') { + className += 'flight-approval-row editable-row'; + } else if (record.approvalCd === 'F') { + className += + 'flight-not-approval-row editable-row'; + } else if (record.approvalCd === 'C') { + className += + 'flight-condition-approval-row editable-row'; + } else className += 'editable-row'; + + if (props.selected?.length > 0) { + if (record.planAreaSno === props.selected[0]) { + className += ' flight-approval-row-click'; + } + } + + if (record.length > 1) { + className += 'expanded-tr'; + } + return className; + }} + rowSelection={{ + ...rowSelection + }} + onRow={record => ({ + onClick: event => { + handleRowClick(record); + } + })} + loading={laancAprvLoading} + scroll={{ + x: 1700 + }} + pagination={{ + position: ['bottomLeft'] + }} + rowHoverable={false} + expandIconColumnIndex={-1} + onChange={(pagination, filters, sorter, extra) => { + handlePageChange(); + }} + /> + + + + {modal && ( + + modal.type === 'review' + ? updateReviewedType('P', currentPlanAreaSno) + : handleSave(modal.row) + } + color='primary' + /> + )} + + ) : ( +
+

비행승인 신청 건수가 없습니다.

+
+ )} + + + - + ); } diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js index a49712f0..fbbf9d1b 100644 --- a/src/components/flight/OperationApprovalsTable.js +++ b/src/components/flight/OperationApprovalsTable.js @@ -1,5 +1,6 @@ import React, { useEffect, useState, useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; +import { ConfigProvider } from 'antd'; import { Button, Card, CustomInput } from '@component/ui'; import { openModal } from '@src/redux/features/comn/message/messageSlice'; import { Form, Input, Select, Table } from 'antd'; @@ -840,174 +841,196 @@ export default function OperationApprovalsTable(props) { }; return ( -
-
-
-

비행승인 신청 검토결과 목록

-
-
- {ismodal && ( - - )} - {isCheckBoxModal && ( - - )} -
-
- - {formatDate(props.startDate)} - {props.endDate && props.startDate !== props.endDate - ? '~' + formatDate(props.endDate) + ' ' - : null} - 총 - {approvalCdValue.S + - approvalCdValue.F + - approvalCdValue.U + - approvalCdValue.C} - 건 - + +
+
+
+

비행승인 신청 검토결과 목록

+
-
- - - {/* + + {/* */} - + +
-
-
-
-
    -
  • 승인 {approvalCdValue.S}건
  • -
  • 미승인 {approvalCdValue.F}건
  • -
  • - 조건부 승인 {approvalCdValue.C}건 -
  • -
  • 비대상 {approvalCdValue.U}건
  • -
  • 전송 0건
  • -
  • 미 전송 0건
  • -
+
+
+
    +
  • 승인 {approvalCdValue.S}건
  • +
  • 미승인 {approvalCdValue.F}건
  • +
  • + 조건부 승인 {approvalCdValue.C}건 +
  • +
  • 비대상 {approvalCdValue.U}건
  • +
  • 전송 0건
  • +
  • 미 전송 0건
  • +
+
-
-
- -
- {laancAprvList?.length > 0 ? ( -
- -
- -
- item.areaList.map((area, index) => ({ - ...area, - key: `${area.planAreaSno}` - })) - ) - .flat()} - columns={mergedColumns} - rowClassName={record => { - let className = ''; - if (record?.approvalCd === 'S') { - className += 'flight-approval-row editable-row'; - } else if (record.approvalCd === 'F') { - className += 'flight-not-approval-row editable-row'; - } else if (record.approvalCd === 'C') { - className += - 'flight-condition-approval-row editable-row'; - } else className += 'editable-row'; - - if (props.selected?.length > 0) { - if (record.planAreaSno === props.selected[0]) { - className += ' flight-approval-row-click'; +
+ +
+ {laancAprvList?.length > 0 ? ( + + +
+ +
1) { - className += 'expanded-tr'; - } - return className; - }} - onRow={record => ({ - onClick: event => { - handleRowClick(record); - } - })} - rowSelection={{ - ...rowSelection - }} - loading={laancAprvLoading} - scroll={{ - x: 1700 - }} - rowHoverable={false} - expandIconColumnIndex={-1} - onChange={(pagination, filters, sorter, extra) => { - handlePageChange(); - }} - pagination={{ - position: ['bottomLeft'] - }} - /> - - - - {modal && ( - handleSave(modal.row)} - color='primary' - /> - )} - - ) : ( -
-

비행승인 신청 건수가 없습니다.

-
- )} - - + }} + dataSource={laancAprvList + .map((item, index) => + item.areaList.map((area, index) => ({ + ...area, + key: `${area.planAreaSno}` + })) + ) + .flat()} + columns={mergedColumns} + rowClassName={record => { + let className = ''; + if (record?.approvalCd === 'S') { + className += 'flight-approval-row editable-row'; + } else if (record.approvalCd === 'F') { + className += + 'flight-not-approval-row editable-row'; + } else if (record.approvalCd === 'C') { + className += + 'flight-condition-approval-row editable-row'; + } else className += 'editable-row'; + + if (props.selected?.length > 0) { + if (record.planAreaSno === props.selected[0]) { + className += ' flight-approval-row-click'; + } + } + + if (record.length > 1) { + className += 'expanded-tr'; + } + return className; + }} + onRow={record => ({ + onClick: event => { + handleRowClick(record); + } + })} + rowSelection={{ + ...rowSelection + }} + loading={laancAprvLoading} + scroll={{ + x: 1700 + }} + rowHoverable={false} + expandIconColumnIndex={-1} + onChange={(pagination, filters, sorter, extra) => { + handlePageChange(); + }} + pagination={{ + position: ['bottomLeft'] + }} + /> + + + + {modal && ( + handleSave(modal.row)} + color='primary' + /> + )} + + ) : ( +
+

비행승인 신청 건수가 없습니다.

+
+ )} + + + - + ); }