feat/추가 요구 사항 추가

src/components/flight/ControlApprovalsTable.js

@@ -528,25 +528,25 @@ export default function ControlApprovalsTable(props) {
         );
       }
     },
-    {
+    // {
-      title: <>안전운항과</>,
+    //   title: <>안전운항과</>,
-      dataIndex: 'reviewedType',
+    //   dataIndex: 'reviewedType',
-      align: 'center',
+    //   align: 'center',
-      width: '130px',
+    //   width: '130px',
-      render: (reviewedType, record) => {
+    //   render: (reviewedType, record) => {
-        return reviewedType !== 'R' ? (
+    //     return reviewedType !== 'R' ? (
-          <>{handlerReviewed(reviewedType, 'operation')}</>
+    //       <>{handlerReviewed(reviewedType, 'operation')}</>
-        ) : (
+    //     ) : (
-          <Button color='flat-dark' onClick={() => handleIsModal(record)}>
+    //       <Button color='flat-dark' onClick={() => handleIsModal(record)}>
-            <>
+    //         <>
-              재검토
+    //           재검토
-              <br />
+    //           <br />
-              사유보기
+    //           사유보기
-            </>
+    //         </>
-          </Button>
+    //       </Button>
-        );
+    //     );
-      }
+    //   }
-    },
+    // },
     {
       title: (
         <>
@@ -915,6 +915,11 @@ export default function ControlApprovalsTable(props) {
                           }
                         }}
                         dataSource={laancAprvList
+                          .filter(
+                            i =>
+                              i.applyDt !== '2024-08-26' &&
+                              i.applyDt !== '2024-08-27'
+                          )
                           .map((item, index) =>
                             item.areaList.map((area, index) => ({
                               ...area,

src/components/flight/NewFlightApprovalsReport.js

@@ -170,45 +170,48 @@ export default function NewFlightApprovalsReport(props) {
               </FormGroup>
             </div>
           </div>
-          <div className='list-input'>
+          {props.pageName !== 'control' && (
-            <div className='layer-content'>
+            <div className='list-input'>
-              <FormGroup>
+              <div className='layer-content'>
-                <Label for='searchDate'>
+                <FormGroup>
-                  {props.pageName === 'control' ? '안전운항과' : '관제통신과'}
+                  <Label for='searchDate'>
-                </Label>
+                    {props.pageName === 'control' ? '안전운항과' : '관제통신과'}
-                <CustomInput
+                  </Label>
-                  type='select'
+                  <CustomInput
-                  bsSize='sm'
+                    type='select'
-                  id={
+                    bsSize='sm'
-                    props.pageName === 'control'
+                    id={
-                      ? 'reviewedType'
+                      props.pageName === 'control'
-                      : 'reviewedProcType'
+                        ? 'reviewedType'
-                  }
+                        : 'reviewedProcType'
-                  value={
+                    }
-                    props.pageName === 'control'
+                    value={
-                      ? props.reviewedType
+                      props.pageName === 'control'
-                      : props.reviewedProcType
+                        ? props.reviewedType
-                  }
+                        : props.reviewedProcType
-                  onChange={e => {
+                    }
-                    props.pageName === 'control'
+                    onChange={e => {
-                      ? props.setReviewedType(e.target.value)
+                      props.pageName === 'control'
-                      : props.setReviewedProcType(e.target.value);
+                        ? props.setReviewedType(e.target.value)
-                  }}
+                        : props.setReviewedProcType(e.target.value);
-                  onKeyPress={handleKeyDown}
+                    }}
-                >
+                    onKeyPress={handleKeyDown}
-                  {Object.entries(
+                  >
-                    props.pageName === 'control'
+                    {Object.entries(
-                      ? FlightCategory.Operation
+                      props.pageName === 'control'
-                      : FlightCategory.Control
+                        ? FlightCategory.Operation
-                  ).map(([key, value]) => (
+                        : FlightCategory.Control
-                    <option key={key} value={key}>
+                    ).map(([key, value]) => (
-                      {value}
+                      <option key={key} value={key}>
-                    </option>
+                        {value}
-                  ))}
+                      </option>
-                </CustomInput>
+                    ))}
-              </FormGroup>
+                  </CustomInput>
+                </FormGroup>
+              </div>
             </div>
-          </div>
+          )}
+
           <div className='list-input'>
             <div className='layer-content'>
               <FormGroup>

src/components/flight/OperationApprovalsTable.js

@@ -422,6 +422,15 @@ export default function OperationApprovalsTable(props) {
         return weightNm ?? '-';
       }
     },
+    {
+      title: <>기체용도</>,
+      dataIndex: 'benefit',
+      align: 'center',
+      width: '90px',
+      render: (benefit, record) => {
+        return benefit === 'Y' ? '영리' : '비영리';
+      }
+    },
     {
       title: <>비행 목적</>,
       dataIndex: 'purpose',

src/configs/constants.ts

@@ -238,21 +238,21 @@ export type DistrictCategory =
 export const FlightCategory = {
   Control: {
     전체: '전체',
-    S: '완료',
     W: '검토대기',
-    R: '재검토',
+    S: '검토완료'
-    C: '검토취소',
+    // R: '재검토',
-    P: '요청처리'
+    // C: '검토취소',
+    // P: '요청처리'
   },
   Operation: {
     전체: '전체',
-    S: '완료',
+    S: '검토완료',
-    Q: '검토요청',
+    W: '검토대기',
-    R: '재검토요청',
+    Q: '검토요청'
-    W: '대기',
+    // R: '재검토요청',
-    U: '불필요',
+    // U: '불필요',
-    C: '검토요청취소',
+    // C: '검토요청취소',
-    P: '검토요청처리'
+    // P: '검토요청처리'
   }
 };