From 608c12889bc23622159fa732393abbb7a49205a4 Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Thu, 5 Sep 2024 11:52:27 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=EA=B3=BC,=20=EC=9A=B4?=
 =?UTF-8?q?=ED=95=AD=EA=B3=BC=20=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=84=EC=86=A1=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/NewFlightApprovalsReport.js          | 17 ++++++++++++-----
 .../flight/OperationApprovalsTable.js           | 13 +++++++++----
 .../flight/ControlApprovalsContainer.js         |  3 +++
 .../flight/OperationApprovalsContainer.js       |  6 +++++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js
index ff0d791e..09cc35fb 100644
--- a/src/components/flight/NewFlightApprovalsReport.js
+++ b/src/components/flight/NewFlightApprovalsReport.js
@@ -248,13 +248,20 @@ export default function NewFlightApprovalsReport(props) {
                             <CustomInput
                               type='select'
                               bsSize='sm'
-                              id='sendProcStatus'
-                              onChange={e =>
+                              id={
+                                props.pageName === 'control'
+                                  ? 'sendProcStatus'
+                                  : 'sendStatus'
+                              }
+                              onChange={e => {
+                                console.log(props.checkState);
                                 props.setCheckState({
                                   ...props.checkState,
-                                  sendProcStatus: e.target.value
-                                })
-                              }
+                                  ...(props.pageName === 'control'
+                                    ? { sendProcStatus: e.target.value }
+                                    : { sendStatus: e.target.value })
+                                });
+                              }}
                               value={props.checkState.sendProcStatus}
                             >
                               <option value='전체'>전송 상태</option>
diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js
index 148092f4..6e8e7b33 100644
--- a/src/components/flight/OperationApprovalsTable.js
+++ b/src/components/flight/OperationApprovalsTable.js
@@ -819,7 +819,12 @@ export default function OperationApprovalsTable(props) {
 
     // 검토 요청, 재 요청 조건
     const checkCondition = {
-      A: item => item.reviewedType !== 'R' && item.reviewedType !== 'C',
+      A: item => {
+        return (
+          !(item.reviewedType === 'P' || item.reviewedType === 'S') &&
+          !(item?.reviewedProcType === 'P' || item?.reviewedProcType === 'S')
+        );
+      },
       Q: item => item.reviewedType !== 'W',
       S: item => item.reviewedType !== 'U' && item.reviewedType !== 'W'
     };
@@ -827,8 +832,8 @@ export default function OperationApprovalsTable(props) {
     // 요청 실패 시 에러 메시지
     const errorMessages = {
       A: [
-        '재 요청 요청 실패',
-        '검토결과 완료, 검토취소인 신청건만 재 요청이 가능합니다.'
+        '드론 원스톱 전송 실패',
+        '안전운항과, 관제통신과 검토완료 상태인 미전송건만 전송 가능합니다.'
       ],
       Q: ['검토 요청 실패', '검토결과 대기인 신청건만 요청이 가능합니다.'],
       S: [
@@ -895,7 +900,7 @@ export default function OperationApprovalsTable(props) {
     }
 
     // 요청 성공 시 액션 핸들러 실행
-    await actionHandlers[type]();
+    // await actionHandlers[type]();
   };
 
   return (
diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js
index 1e00cc4f..54e8bdd1 100644
--- a/src/containers/flight/ControlApprovalsContainer.js
+++ b/src/containers/flight/ControlApprovalsContainer.js
@@ -251,6 +251,9 @@ export default function ControlApprovalsContainer({ mode }) {
         : {}),
       ...(checkState.reviewedProcType !== '전체'
         ? { reviewedProcType: checkState.reviewedProcType }
+        : {}),
+      ...(checkState.sendProcStatus !== '전체'
+        ? { sendProcStatus: checkState.sendProcStatus }
         : {})
     };
 
diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index 7846aeef..8f0f26d5 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -70,7 +70,8 @@ export default function OperationApprovalsContainer({ mode }) {
   const [checkState, setCheckState] = useState({
     reviewedType: '전체',
     reviewedProcType: '전체',
-    limitZoneNm: '전체'
+    limitZoneNm: '전체',
+    sendStatus: '전체'
   });
 
   // 지역
@@ -290,6 +291,9 @@ export default function OperationApprovalsContainer({ mode }) {
         : {}),
       ...(checkState.reviewedProcType !== '전체'
         ? { reviewedProcType: checkState.reviewedProcType }
+        : {}),
+      ...(checkState.sendStatus !== '전체'
+        ? { sendStatus: checkState.sendStatus }
         : {})
     };