diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index c36bd8c1..57ddaf97 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -1,11 +1,13 @@ import React, {useEffect, useState} from 'react'; -import {Col, Row} from 'reactstrap'; +import {Col, Row, Button} from 'reactstrap'; import {CustomMainLayout} from '../../../../components/layout/CustomMainLayout'; import moment from 'moment/moment'; import FlightPlanAprvSearch from '../../../../components/basis/flight/aprv/FlightPlanAprvSearch'; import FlightPlanAprvGrid from '../../../../components/basis/flight/aprv/FlightPlanAprvGrid'; +import FlightPlanGrid from '../../../../components/basis/flight/plan/FlightPlanGrid'; import {useDispatch, useSelector} from 'react-redux'; import * as FlightAction from '../../../../modules/basis/flight/actions/basisFlightAction'; +import {useHistory} from 'react-router-dom'; const initSearchData = { schFltStDt: moment().set({'date': 1, 'h': 0, 'm': 0, 's': 0}).format('YYYY-MM-DD HH:mm:ss'), @@ -14,24 +16,37 @@ const initSearchData = { cstmrSno: 0, }; -const columns = [ - {id: 'planSno', name: '번호', cell: (row, i) => (
{i + 1}
)}, - {id: 'fltPurpose', name: '비행목적', cell: row => (
{row.fltPurpose}
)}, - { - id: 'fltMethod', name: '비행방식', cell: row => { - const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-'; - return
{displayName}
- } - }, - {id: 'schFltStDt', name: '출발일', cell: row => (
{row.schFltStDt}
)}, - {id: 'aprvlYn', name: '승인여부', cell: row => (
{row.aprvlYn}
)} -]; const FlightPlanAprvContainer = () => { const dispatch = useDispatch(); const [searchData, setSearchData] = useState(initSearchData); const [selPlanSnoList, setSelPlanSnoList] = useState([]); const {aprvList, aprvProc} = useSelector(state => state.flightState); + const history = useHistory(); + + const handleMoveDetail = (id) => { + history.push(`/basis/flight/plan/detail/${id}`) + } + + const columns = [ + {id: 'planSno', name: '번호', cell: (row, i) => (
{i + 1}
)}, + {id: 'fltPurpose', name: '비행목적', cell: row => (
{row.fltPurpose}
)}, + { + id: 'fltMethod', name: '비행방식', cell: row => { + const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-'; + return
{displayName}
+ } + }, + {id: 'schFltStDt', name: '출발일', cell: row => (
{row.schFltStDt}
)}, + {id: 'aprvlYn', name: '승인여부', cell: row => (
{row.aprvlYn}
)}, + { + id: 'moveDetail', name: '상세보기', cell: row => { + return { + handleMoveDetail(row.planSno)} + }>상세; + } + } + ]; // 최초 비행계획서 목록 조회 useEffect(() => { @@ -87,6 +102,13 @@ const FlightPlanAprvContainer = () => { handleChangeSelected={handleChangeSelected} handleClickAprv={handleClickAprv} /> + + {/* */}