Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/basis/flight/aprv/FlightPlanAprvGrid.js

@@ -28,10 +28,6 @@ const FlightPlanAprvGrid = ({
     });
   }, [selectGroup]);
 
-  useEffect(() => {
-    console.log(selPlanSnoList, '>>>');
-  }, [selPlanSnoList]);
-
   const columns = [
     // {
     //   id: '',
@@ -96,9 +92,9 @@ const FlightPlanAprvGrid = ({
       name: '상세보기',
       cell: row => {
         return (
-          <Link
-          to={`/basis/flight/plan/detail/${row.planSno}`}
-          size='sm'>상세</Link>
+          <Link to={`/basis/flight/plan/detail/${row.planSno}`} size='sm'>
+            상세보기
+          </Link>
         );
       }
     }

src/components/basis/flight/plan/FlightPlanGrid.js

@@ -4,68 +4,81 @@ import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Redirect } from 'react-router-dom';
 import { Link, useHistory } from 'react-router-dom';
 
-
 const FlightPlanGrid = ({ movePage, planListData }) => {
+  const columns = [
+    { id: 'planSno', name: '번호', cell: (row, i) => <div>{i + 1}</div> },
+    {
+      id: 'fltPurpose',
+      name: '비행목적',
+      cell: row => <div>{row.fltPurpose}</div>
+    },
+    {
+      id: 'fltMethod',
+      name: '비행방식',
+      cell: row => {
+        const displayName =
+          (row.areaList &&
+            row.areaList.length > 0 &&
+            row.areaList[0].fltMethod) ||
+          '-';
+        return <div>{displayName}</div>;
+      }
+    },
+    {
+      id: 'schFltStDt',
+      name: '출발일',
+      cell: row => <div>{row.schFltStDt}</div>
+    },
+    { id: 'aprvlYn', name: '승인여부', cell: row => <div>{row.aprvlYn}</div> },
+    {
+      id: 'moveDetail',
+      name: '상세보기',
+      cell: row => {
+        return (
+          <Link to={`/basis/flight/plan/detail/${row.planSno}`} size='sm'>
+            상세보기
+          </Link>
+        );
+      }
+    }
+  ];
 
-    const columns = [
-        { id: 'planSno', name: '번호', cell: (row, i) => (<div>{i + 1}</div>) },
-        { id: 'fltPurpose', name: '비행목적', cell: row => (<div>{row.fltPurpose}</div>) },
-        {
-            id: 'fltMethod', name: '비행방식', cell: row => {
-                const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-';
-                return <div>{displayName}</div>
-            }
-        },
-        { id: 'schFltStDt', name: '출발일', cell: row => (<div>{row.schFltStDt}</div>) },
-        { id: 'aprvlYn', name: '승인여부', cell: row => (<div>{row.aprvlYn}</div>) },
-        {
-            id: 'moveDetail', name: '상세보기', cell: row => {
-                return <Link
-                    to={`/basis/flight/plan/detail/${row.planSno}`}
-                    size='sm'>상세</Link>;
-            }
-        }
-    ];
-
-    return (
-        <div className='mt-2'>
-            <Row>
-                <Col>
-                    <div
-                        className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
-                        <div>
-                            <h4>비행계획서 신청 목록</h4>
-                            <span className='search-case'>검색결과 총 {!!planListData ? planListData.length : 0}건</span>
-                        </div>
-                        <div className='d-flex align-items-center'>
-                            <Button.Ripple
-                                color='primary'
-                                size='sm'
-                                onClick={movePage}
-                            >
-                                {/* 계획서 생성 */}
-                                비행계획서 신청
-                            </Button.Ripple>
-                        </div>
-                    </div>
-                    <div className='invoice-list-wrapper'>
-                        <Card>
-                            <div className='invoice-list-dataTable'>
-                                <GridDatabase
-                                    title={'비행이력'}
-                                    data={planListData}
-                                    columns={columns}
-                                    count={!!planListData ? planListData.length : 0}
-                                // pagination={props.pagination}
-                                />
-                                {/* 검색된 데이터가 없습니다. */}
-                            </div>
-                        </Card>
-                    </div>
-                </Col>
-            </Row>
-        </div>
-    )
-}
+  return (
+    <div className='mt-2'>
+      <Row>
+        <Col>
+          <div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
+            <div>
+              <h4>비행계획서 신청 목록</h4>
+              <span className='search-case'>
+                검색결과 총 {!!planListData ? planListData.length : 0}건
+              </span>
+            </div>
+            <div className='d-flex align-items-center'>
+              <Button.Ripple color='primary' size='sm' onClick={movePage}>
+                {/* 계획서 생성 */}
+                비행계획서 신청
+              </Button.Ripple>
+            </div>
+          </div>
+          <div className='invoice-list-wrapper'>
+            <Card>
+              <div className='invoice-list-dataTable'>
+                <GridDatabase
+                  title={'비행이력'}
+                  data={planListData}
+                  columns={columns}
+                  count={!!planListData ? planListData.length : 0}
+                  // pagination={props.pagination}
+                />
+                {/* 검색된 데이터가 없습니다. */}
+              </div>
+            </Card>
+          </div>
+        </Col>
+      </Row>
+    </div>
+  );
+};
 
 export default FlightPlanGrid;