diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index a69ff1a..9f9ea57 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -15,7 +15,9 @@ const FlightPlanAprvGrid = ({ handleChangeCheckbox, paginationPerPage, pagination, - paginationRowsPerPageOptions + paginationRowsPerPageOptions, + handlerPageChange, + total }) => { const [aprvAuth, setAprvAuth] = useState(''); const { loading } = useSelector(state => state.loadingReducer); @@ -148,6 +150,8 @@ const FlightPlanAprvGrid = ({ pagination={pagination} paginationPerPage={paginationPerPage} paginationRowsPerPageOptions={paginationRowsPerPageOptions} + handlerPageChange={handlerPageChange} + total={total} /> {/* 검색된 데이터가 없습니다. */} diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index 50ab0ba..d47a2e5 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -34,7 +34,8 @@ const FlightPlanAprvContainer = () => { const { list: aprvList, aprvProc, - selectGroup + selectGroup, + total } = useSelector(state => state.flightState); const { joinList, joinListCount, groupList, groupListCount } = useSelector( state => state.groupState @@ -46,7 +47,6 @@ const FlightPlanAprvContainer = () => { desc: '', color: '' }); - const columns = [ { // id: 'groupNm', @@ -67,7 +67,7 @@ const FlightPlanAprvContainer = () => { sortable: true, cell: row =>
{row.groupId}
}, - + { name: '생성일시', selector: row => row?.createDt, @@ -146,7 +146,7 @@ const FlightPlanAprvContainer = () => { groupId: groupId }; }); - dispatch(FlightAction.FLIGHT_PLAN_LIST.request(param)); + dispatch(FlightAction.FLIGHT_APRV_LIST.request({ ...param, page: 1 })); } else { setModal({ isOpen: true, @@ -193,7 +193,7 @@ const FlightPlanAprvContainer = () => { }, [aprvProc]); const handleSearch = data => { - dispatch(FlightAction.FLIGHT_APRV_LIST.request(data)); + dispatch(FlightAction.FLIGHT_APRV_LIST.request({ ...data, page: 1 })); }; const handleChangeSearchData = values => { setSearchData(prevState => ({ @@ -246,6 +246,10 @@ const FlightPlanAprvContainer = () => { dispatch(FlightAction.FLIGHT_APRV_PROC.request(sendData)); }; + const onChangePage = page => { + dispatch(FlightAction.FLIGHT_APRV_LIST.request({ ...searchData, page })); + }; + return ( {/*
*/} @@ -310,6 +314,7 @@ const FlightPlanAprvContainer = () => { handleSearch={handleSearch} /> { pagination={true} paginationPerPage={10} paginationRowsPerPageOptions={[10, 20, 30, 40]} + total={total} // handleChangeCheckbox={handleChangeCheckbox} /> diff --git a/src/modules/basis/flight/actions/basisFlightAction.ts b/src/modules/basis/flight/actions/basisFlightAction.ts index a17c4aa..1380c34 100644 --- a/src/modules/basis/flight/actions/basisFlightAction.ts +++ b/src/modules/basis/flight/actions/basisFlightAction.ts @@ -225,7 +225,15 @@ export const FLIGHT_APRV_LIST = createAsyncAction( FLIGHT_APRV_LIST_REQUEST, FLIGHT_APRV_LIST_SUCCESS, FLIGHT_APRV_LIST_FAILURE -)(); +)< + FlightPlanListRqData, + { + items: [FlightPlanData]; + total: number; + count: number; + }, + AxiosError +>(); // 비행계획서 승인/미승인 처리 export const FLIGHT_APRV_PROC = createAsyncAction( FLIGHT_APRV_PROC_REQUEST, diff --git a/src/modules/basis/flight/models/basisFlightModel.ts b/src/modules/basis/flight/models/basisFlightModel.ts index 38fc316..ec4eba3 100644 --- a/src/modules/basis/flight/models/basisFlightModel.ts +++ b/src/modules/basis/flight/models/basisFlightModel.ts @@ -15,6 +15,9 @@ export interface FlightState { aprvList: [FlightPlanData] | undefined; aprvProc: any | undefined; scheduleList: BasFlightScheduleList[] | []; + page: number | 1; + total: number | 0; + conut: number | 0; } export interface SelectGroupData { @@ -153,6 +156,7 @@ export interface FlightPlanListRqData { schFltStDt: string; schFltEndDt: string; aprvlYn: string; + page: number; } export interface FlightPlanAprovRqData { @@ -193,6 +197,9 @@ export interface BasFlightScheduleData { } export const initFlight = { + page: 1, + total: 0, + conut: 0, selectGroup: { cstmrSno: 0, groupId: '', @@ -259,6 +266,7 @@ export const initFlight = { ] } ], + pilotList: [ { planPilotSno: 0, @@ -322,6 +330,8 @@ export const initFlight = { }; export const initFlightBas = { + page: 1, + total: 0, plan: { planSno: 0, groupId: '', diff --git a/src/modules/basis/flight/reducers/basisFlightReducer.ts b/src/modules/basis/flight/reducers/basisFlightReducer.ts index d048aa8..240c3a4 100644 --- a/src/modules/basis/flight/reducers/basisFlightReducer.ts +++ b/src/modules/basis/flight/reducers/basisFlightReducer.ts @@ -120,7 +120,9 @@ export const flightReducer = createReducer( .handleAction(Actions.FLIGHT_APRV_LIST.success, (state, action) => produce(state, draft => { const data = action.payload; - draft.list = data; + draft.list = data.items; + draft.total = data.total; + draft.conut = data.count; }) ) // 비행계획서 승인처리