From b4b7e14eec53bdcb2c2573512e78ce0321854780 Mon Sep 17 00:00:00 2001 From: JANGHYUNn Date: Mon, 26 Aug 2024 17:18:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EA=B2=80=ED=86=A0=EC=9C=A0?= =?UTF-8?q?=ED=98=95=20=EC=9E=84=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/ControlApprovalsTable.js | 26 +++++++++-- .../flight/OperationApprovalsTable.js | 46 ++++++++++++++----- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 062304d2..fd8bd63b 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -121,7 +121,7 @@ export default function ControlApprovalsTable(props) { text = '재검토요청'; break; case 'S': - text = '완료'; + text = '검토완료'; break; case 'C': text = '검토요청취소'; @@ -130,7 +130,7 @@ export default function ControlApprovalsTable(props) { text = '불필요'; break; case 'P': - text = '검토요청처리'; + text = '검토완료'; break; default: text = '-'; @@ -475,9 +475,27 @@ export default function ControlApprovalsTable(props) { const handleMouseDown = e => { e.stopPropagation(); // 이벤트 전파 중지 }; + + if (reviewedProcType === 'S') { + reviewedProcType = 'Q'; + } return ( <> - 완료 - + */} ); } diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js index 02e206a3..63c2d524 100644 --- a/src/components/flight/OperationApprovalsTable.js +++ b/src/components/flight/OperationApprovalsTable.js @@ -133,7 +133,7 @@ export default function OperationApprovalsTable(props) { if (type === 'operation') { switch (value) { case 'W': - text = '대기'; + text = '검토대기'; break; case 'Q': text = '검토요청'; @@ -142,7 +142,7 @@ export default function OperationApprovalsTable(props) { text = '재검토요청'; break; case 'S': - text = '완료'; + text = '검토완료'; break; case 'C': text = '검토요청취소'; @@ -169,7 +169,7 @@ export default function OperationApprovalsTable(props) { text = '검토취소'; break; case 'P': - text = '요청처리'; + text = '검토완료'; break; default: @@ -459,6 +459,12 @@ export default function OperationApprovalsTable(props) { const handleMouseDown = e => { e.stopPropagation(); // 이벤트 전파 중지 }; + if (reviewedType === 'U') { + reviewedType = 'W'; + } else if (reviewedType === 'P') { + reviewedType = 'S'; + } + return ( <> @@ -502,8 +508,24 @@ export default function OperationApprovalsTable(props) { dataIndex: 'reviewedProcType', align: 'center', width: '130px', - render: reviewedProcType => { - return <>{handlerReviewed(reviewedProcType, 'control')}; + render: (reviewedProcType, record) => { + return ( + <> + {record.reviewedType === 'W' && record.limitZoneCd === 'H' ? ( + + ) : ( + handlerReviewed(reviewedProcType, 'control') + )} + + ); } }, {