비행 계획 승인 목록 수정

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -10,23 +10,28 @@ import * as FlightAction from '../../../../modules/basis/flight/actions/basisFli
 import { useHistory } from 'react-router-dom';
 import FlightPlanGroupGrid from '../../../../components/basis/flight/plan/FlightPlanGroupGrid';
 import { JOIN_LIST } from '../../../../modules/basis/group/actions/basisGroupAction';
-import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'
+import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
 
 const initSearchData = {
-    schFltStDt: moment().set({'date': 1, 'h': 0, 'm': 0, 's': 0}).format('YYYY-MM-DD HH:mm:ss'),
+  schFltStDt: moment()
-    schFltEndDt: moment().set({'h': 23, 'm': 59, 's': 59}).format('YYYY-MM-DD HH:mm:ss'),
+    .set({ date: 1, h: 0, m: 0, s: 0 })
+    .format('YYYY-MM-DD HH:mm:ss'),
+  schFltEndDt: moment()
+    .set({ h: 23, m: 59, s: 59 })
+    .format('YYYY-MM-DD HH:mm:ss'),
   aprvlYn: 'N',
   groupId: '',
-    cstmrSno: 0,
+  cstmrSno: 0
 };
 
-
 const FlightPlanAprvContainer = () => {
   const dispatch = useDispatch();
   const history = useHistory();
   const [searchData, setSearchData] = useState(initSearchData);
   const [selPlanSnoList, setSelPlanSnoList] = useState([]);
-  const {list: aprvList, aprvProc, selectGroup} = useSelector(state => state.flightState);
+  const { aprvList, aprvProc, selectGroup } = useSelector(
+    state => state.flightState
+  );
   const { joinList, joinListCount } = useSelector(state => state.groupState);
   const { user } = useSelector(state => state.authState, shallowEqual);
   const [modal, setModal] = useState({
@@ -34,7 +39,7 @@ const FlightPlanAprvContainer = () => {
     title: '',
     desc: '',
     color: ''
-  })
+  });
 
   const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => {
     // 권한 상관 없이 모두 조회 가능
@@ -43,7 +48,13 @@ const FlightPlanAprvContainer = () => {
     param.cstmrSno = user.cstmrSno;
     param.groupId = groupId;
 
-      dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT( {cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm} ));
+    dispatch(
+      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+        cstmrSno: user.cstmrSno,
+        groupId: groupId,
+        groupNm: groupNm
+      })
+    );
 
     // groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
     sessionStorage.setItem('groupId', groupId);
@@ -54,45 +65,74 @@ const FlightPlanAprvContainer = () => {
         ...prevState,
         cstmrSno: user.cstmrSno,
         groupId: groupId
-          }
+      };
     });
 
     dispatch(FlightAction.FLIGHT_PLAN_LIST.request(param));
-    }
+  };
 
   const handlerGroupCancel = () => {
-      dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT( {cstmrSno: 0, groupId: '', groupNm: ''} ));
+    dispatch(
-    }
+      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+        cstmrSno: 0,
+        groupId: '',
+        groupNm: ''
+      })
+    );
+  };
 
-    const handleMoveDetail = (id) => {
+  const handleMoveDetail = id => {
-      history.push(`/basis/flight/plan/detail/${id}`)
+    history.push(`/basis/flight/plan/detail/${id}`);
-    }
+  };
 
   const columns = [
-      {id: 'planSno', name: '번호', cell: (row, i) => (<div>{i + 1}</div>)},
+    { id: 'planSno', name: '번호', cell: (row, i) => <div>{i + 1}</div> },
-      {id: 'fltPurpose', name: '비행목적', cell: row => (<div>{row.fltPurpose}</div>)},
+    {
+      id: 'fltPurpose',
+      name: '비행목적',
+      cell: row => <div>{row.fltPurpose}</div>
+    },
     {
-          id: 'fltMethod', name: '비행방식', cell: row => {
+      id: 'fltMethod',
-              const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-';
+      name: '비행방식',
-              return <div>{displayName}</div>
+      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 => {
+      id: 'schFltStDt',
-            return <Button.Ripple color='primary' size='sm' onClick={() => {
+      name: '출발일',
-                handleMoveDetail(row.planSno)}
+      cell: row => <div>{row.schFltStDt}</div>
-            }>상세</Button.Ripple>;
+    },
+    { id: 'aprvlYn', name: '승인여부', cell: row => <div>{row.aprvlYn}</div> },
+    {
+      id: 'moveDetail',
+      name: '상세보기',
+      cell: row => {
+        return (
+          <Button.Ripple
+            color='primary'
+            size='sm'
+            onClick={() => {
+              handleMoveDetail(row.planSno);
+            }}
+          >
+            상세
+          </Button.Ripple>
+        );
       }
     }
   ];
 
   // 최초 비행계획서 목록 조회
   useEffect(() => {
-      
+    // handleSearch(searchData);
-        handleSearch(searchData);
+  }, []);
-    }, [])
   useEffect(() => {
     if (user?.cstmrSno) {
       dispatch(
@@ -101,27 +141,26 @@ const FlightPlanAprvContainer = () => {
         })
       );
     }
-    }, [user])
+  }, [user]);
   useEffect(() => {
     if (aprvProc && aprvProc.result > 0) {
       handleSearch(searchData);
     }
-    }, [aprvProc])
+  }, [aprvProc]);
-
 
-    const handleSearch = (data) => {
+  const handleSearch = data => {
     dispatch(FlightAction.FLIGHT_APRV_LIST.request(data));
-    }
+  };
-    const handleChangeSearchData = (values) => {
+  const handleChangeSearchData = values => {
     setSearchData(prevState => ({
       ...prevState,
       ...values
-        }))
+    }));
-    }
+  };
   const handleChangeSelected = ({ selectedRows }) => {
-        setSelPlanSnoList(selectedRows.map(item => item.planSno))
+    setSelPlanSnoList(selectedRows.map(item => item.planSno));
-    }
+  };
-    const handleClickAprv = (type) => (e) => {
+  const handleClickAprv = type => e => {
     // notAprov, aprv
     //  console.log(type, selPlanSnoList, e)
     if (!selPlanSnoList || selPlanSnoList.length < 1) {
@@ -132,20 +171,18 @@ const FlightPlanAprvContainer = () => {
         title: '비행 계획 승인',
         desc: '비행계획서를 선택해주세요.',
         color: 'modal-danger'
-            })
+      });
       return;
-  
     }
-        ;
     const sendData = {
       planSnoList: [...selPlanSnoList],
       aprvlYn: type === 'aprv' ? 'Y' : 'N'
-        }
+    };
     dispatch(FlightAction.FLIGHT_APRV_PROC.request(sendData));
-    }
+  };
 
   return (
-        <CustomMainLayout title={"비행계획서 승인"}>
+    <CustomMainLayout title={'비행계획서 승인'}>
       <div className='pal-card-box'>
         <Row>
           {/* <Col sm='12'>
@@ -180,6 +217,7 @@ const FlightPlanAprvContainer = () => {
           <Col sm='8'>
             {selectGroup.cstmrSno !== 0 ? (
               <>
+                {console.log(searchData)}
                 <FlightPlanAprvSearch
                   searchData={searchData}
                   handleChangeSearchData={handleChangeSearchData}
@@ -225,11 +263,8 @@ const FlightPlanAprvContainer = () => {
           </ModalFooter>
         </Modal>
       </div>
-
     </CustomMainLayout>
-
+  );
-        
+};
-    )
-}
 
 export default FlightPlanAprvContainer;

src/modules/basis/flight/reducers/basisFlightReducer.ts

@@ -2,11 +2,16 @@ import { createReducer } from 'typesafe-actions';
 import produce from 'immer';
 
 import * as Actions from '../actions/basisFlightAction';
-import { FlightState, initFlight, initFlightBas } from '../models/basisFlightModel';
+import {
+  FlightState,
+  initFlight,
+  initFlightBas
+} from '../models/basisFlightModel';
 import { any } from 'prop-types';
 
-
+export const flightReducer = createReducer<FlightState, Actions.FlightAction>(
-export const flightReducer = createReducer<FlightState, Actions.FlightAction>(initFlight)
+  initFlight
+)
   .handleAction(Actions.PUBLIC_AREA_LIST.success, (state, action) =>
     produce(state, draft => {
       const { data } = action.payload;
@@ -23,7 +28,7 @@ export const flightReducer = createReducer<FlightState, Actions.FlightAction>(in
   .handleAction(Actions.FLIGHT_PLAN_LIST.success, (state, action) =>
     produce(state, draft => {
       const data = action.payload;
-      draft.list = data;
+      draft.aprvList = data;
     })
   )
   // 상세
@@ -35,7 +40,7 @@ export const flightReducer = createReducer<FlightState, Actions.FlightAction>(in
   )
   .handleAction(Actions.FLIGHT_PLAN_DETAIL_INIT, (state, action) =>
     produce(state, draft => {
-      draft.detail = initFlightBas.initDetail
+      draft.detail = initFlightBas.initDetail;
     })
   )
   // 조종사 조회
@@ -124,4 +129,4 @@ export const flightReducer = createReducer<FlightState, Actions.FlightAction>(in
       const data = action.payload;
       draft.aprvProc = data;
     })
-  )
+  );