조건부 승인 추가

src/components/flight/NewFlightApprovalsTable.js

@@ -23,6 +23,7 @@ export default function NewFlightApprovalsTable(props) {
   const [approvalCdValue, setApprovalCdValue] = useState({
     S: 0,
     F: 0,
+    C: 0,
     U: 0
   });
 
@@ -43,7 +44,7 @@ export default function NewFlightApprovalsTable(props) {
   const isEditing = record => record.key === editingKey;
 
   useEffect(() => {
-    let approvalCdValue = { S: 0, F: 0, U: 0 };
+    let approvalCdValue = { S: 0, F: 0, C: 0, U: 0 };
 
     tableData.map(item => {
       item.areaList.map(area => {
@@ -51,6 +52,8 @@ export default function NewFlightApprovalsTable(props) {
           approvalCdValue.S += 1;
         } else if (area.approvalCd === 'F') {
           approvalCdValue.F += 1;
+        } else if (area.approvalCd === 'C') {
+          approvalCdValue.C += 1;
         } else {
           approvalCdValue.U += 1;
         }
@@ -60,6 +63,7 @@ export default function NewFlightApprovalsTable(props) {
     setApprovalCdValue({
       F: approvalCdValue.F,
       S: approvalCdValue.S,
+      C: approvalCdValue.C,
       U: approvalCdValue.U
     });
   }, [tableData]);
@@ -140,7 +144,7 @@ export default function NewFlightApprovalsTable(props) {
       ),
       dataIndex: 'applyNo',
       align: 'center',
-      width: '40px'
+      width: '60px'
     },
     {
       title: (
@@ -149,7 +153,7 @@ export default function NewFlightApprovalsTable(props) {
         </>
       ),
       dataIndex: 'applyDtMonth',
-      width: '80px',
+      width: '70px',
       align: 'center',
       render: text => `${text}월`
     },
@@ -160,8 +164,9 @@ export default function NewFlightApprovalsTable(props) {
         </>
       ),
       dataIndex: 'applyDtDay',
-      width: '80px',
+      width: '70px',
       align: 'center',
+
       render: text => `${text}일`
     },
     {
@@ -299,7 +304,6 @@ export default function NewFlightApprovalsTable(props) {
       dataIndex: 'fltElevMax',
       align: 'center',
       width: '80px',
-      editable: true,
       render: (text, record) => {
         return text ? text : '-';
       }
@@ -378,12 +382,14 @@ export default function NewFlightApprovalsTable(props) {
               counts.unapproved += 1;
             } else if (item.approvalCd === 'S') {
               counts.approved += 1;
+            } else if (item.approvalCd === 'C') {
+              counts.conditionalapproval += 1;
             } else {
               counts.pending += 1;
             }
             return counts;
           },
-          { unapproved: 0, approved: 0, pending: 0 }
+          { unapproved: 0, approved: 0, pending: 0, conditionalapproval: 0 }
         );
 
         return (
@@ -392,7 +398,10 @@ export default function NewFlightApprovalsTable(props) {
               <>
                 승인: {approvalCounts.approved}건 <br />
                 미승인:
-                {approvalCounts.pending}건<br /> 비대상:
+                {approvalCounts.pending}건
+                <br />
+                조건부승인:{approvalCounts.conditionalapproval}건 <br />
+                비대상:
                 {approvalCounts.unapproved}건
               </>
             ) : (
@@ -401,6 +410,8 @@ export default function NewFlightApprovalsTable(props) {
                   ? '비대상'
                   : areaList[0].approvalCd === 'S'
                   ? '승인'
+                  : areaList[0].approvalCd === 'C'
+                  ? '조건부승인'
                   : '미승인'}
               </>
             )}
@@ -474,18 +485,19 @@ export default function NewFlightApprovalsTable(props) {
     const childColumns = [
       {
         dataIndex: 'applyNo',
-        width: '40px',
+        width: '60px',
         align: 'center'
       },
       {
         dataIndex: 'applyDtMonth',
-        width: '80px',
+        width: '70px',
         align: 'center',
+
         render: text => `${text}월`
       },
       {
         dataIndex: 'applyDtDay',
-        width: '80px',
+        width: '70px',
         align: 'center',
         render: text => `${text}일`
       },
@@ -604,7 +616,15 @@ export default function NewFlightApprovalsTable(props) {
         align: 'center',
         width: '110px',
         render: text => (
-          <>{text === 'U' ? '비대상' : text === 'S' ? '승인' : '미승인'}</>
+          <>
+            {text === 'U'
+              ? '비대상'
+              : text === 'S'
+              ? '승인'
+              : text === 'C'
+              ? '조건부승인'
+              : '미승인'}
+          </>
         )
       },
       {
@@ -684,6 +704,8 @@ export default function NewFlightApprovalsTable(props) {
               className += 'flight-approval-row';
             } else if (record.approvalCd === 'F') {
               className += 'flight-not-approval-row';
+            } else if (record.approvalCd === 'C') {
+              className += 'flight-condition-approval-row editable-row';
             } else className;
 
             if (record.planAreaSno === props.selected) {
@@ -942,7 +964,9 @@ export default function NewFlightApprovalsTable(props) {
           <ul>
             <li className='approval'>승인 {approvalCdValue.S}건</li>
             <li className='not-approved'>미승인 {approvalCdValue.F}건</li>
-            <li className='condition-approved'>조건부 승인 12건</li>
+            <li className='condition-approved'>
+              조건부 승인 {approvalCdValue.C}건
+            </li>
             <li className='non-target'>비대상 {approvalCdValue.U}건</li>
           </ul>
         </div>
@@ -968,11 +992,16 @@ export default function NewFlightApprovalsTable(props) {
                   columns={mergedColumns}
                   rowClassName={record => {
                     let className = '';
-                    if (record?.areaList[0]?.approvalCd === 'S') {
-                      className += 'flight-approval-row editable-row';
-                    } else if (record.areaList[0].approvalCd === 'F') {
-                      className += 'flight-not-approval-row editable-row';
-                    } else className += 'editable-row';
+                    if (record.areaList.length <= 1) {
+                      if (record?.areaList[0]?.approvalCd === 'S') {
+                        className += 'flight-approval-row editable-row';
+                      } else if (record.areaList[0].approvalCd === 'F') {
+                        className += 'flight-not-approval-row editable-row';
+                      } else if (record.areaList[0].approvalCd === 'C') {
+                        className +=
+                          'flight-condition-approval-row editable-row';
+                      } else className += 'editable-row';
+                    }
                     if (
                       record.areaList.length <= 1 &&
                       record.areaList[0].planAreaSno === props.selected