diff --git a/src/components/basis/group/BasisGroupApprovalGrid.js b/src/components/basis/group/BasisGroupApprovalGrid.js index d331bf2..5ed4c34 100644 --- a/src/components/basis/group/BasisGroupApprovalGrid.js +++ b/src/components/basis/group/BasisGroupApprovalGrid.js @@ -22,6 +22,7 @@ import { import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; export const BasisGroupApprovalGrid = props => { + return ( //
// diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 5a63f75..9f46b34 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -22,7 +22,6 @@ export const BasisGroupApprovalContainer = props => { } = useSelector(state => state.groupState); const { user } = useSelector(state => state.authState); - const dispatch = useDispatch(); const titleName = '승인관리'; const [params, setParams] = useState({ @@ -317,7 +316,7 @@ export const BasisGroupApprovalContainer = props => { const handlerSearch = () => { dispatch(Actions.APPROVAL_LIST.request({ searchParams: params, page: 1 })); }; - const handlerPageChange = page => { + const onChangePage = page => { dispatch(Actions.APPROVAL_LIST.request({ searchParams: params, page })); }; const handlerAprvConfirm = cstmrGroupSno => { @@ -411,7 +410,7 @@ export const BasisGroupApprovalContainer = props => { pagination={true} paginationPerPage={10} paginationRowsPerPageOptions={[10, 20, 30, 40]} - handlerPageChange={handlerPageChange} + handlerPageChange={onChangePage} total={total} /> diff --git a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts index c7e0a1b..3f8a4f1 100644 --- a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts +++ b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts @@ -7,6 +7,7 @@ import { AnalysisHistoryData, AnalysisHistoryState } from '../models/analysisHitoryModel'; +import { controlGpSaga } from '../../../control/gp'; export const analysisHistoryReducer = createReducer< AnalysisHistoryState, @@ -28,6 +29,7 @@ export const analysisHistoryReducer = createReducer< .handleAction(Actions.list.success, (state, action) => produce(state, draft => { const { data, count, total } = action.payload; + console.log(data); draft.data = data; draft.count = count; draft.total = total; diff --git a/src/modules/basis/group/actions/basisGroupAction.ts b/src/modules/basis/group/actions/basisGroupAction.ts index 3d72884..31cef2a 100644 --- a/src/modules/basis/group/actions/basisGroupAction.ts +++ b/src/modules/basis/group/actions/basisGroupAction.ts @@ -186,7 +186,11 @@ export const APPROVAL_LIST = createAsyncAction( APPROVAL_LIST_REQUEST, APPROVAL_LIST_SUCCESS, APPROVAL_LIST_FAILURE -)(); +)< + GroupState, + { data: AprvGroupData[]; count: number; total: number }, + AxiosError +>(); export const APPROVAL_UPDATE = createAsyncAction( APPROVAL_UPDATE_REQUEST, diff --git a/src/modules/basis/group/reducers/basisGroupReducer.ts b/src/modules/basis/group/reducers/basisGroupReducer.ts index bd93938..3182a9c 100644 --- a/src/modules/basis/group/reducers/basisGroupReducer.ts +++ b/src/modules/basis/group/reducers/basisGroupReducer.ts @@ -87,6 +87,7 @@ export const groupReducer = createReducer( .handleAction(Actions.APPROVAL_LIST.success, (state, action) => produce(state, draft => { const { data, count, total } = action.payload; + draft.aprvList = data; draft.count = count; draft.aprvCount = total; diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts index 0329ae0..183b2c3 100644 --- a/src/modules/basis/group/sagas/basisGroupSaga.ts +++ b/src/modules/basis/group/sagas/basisGroupSaga.ts @@ -411,7 +411,6 @@ function* aprvListSaga( data: { items, total }, count } = res; - yield put( Actions.APPROVAL_LIST.success({ data: items,