|
|
|
@ -4,12 +4,13 @@ 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, shallowEqual } from 'react-redux'; |
|
|
|
|
import * as FlightAction from '../../../../modules/basis/flight/actions/basisFlightAction'; |
|
|
|
|
import { useHistory } from 'react-router-dom'; |
|
|
|
|
import FlightPlanGroupGrid from '../../../../components/basis/flight/plan/FlightPlanGroupGrid'; |
|
|
|
|
import { JOIN_LIST } from '../../../../modules/basis/group/actions/basisGroupAction'; |
|
|
|
|
import { |
|
|
|
|
JOIN_LIST, |
|
|
|
|
GROUP_LIST |
|
|
|
|
} from '../../../../modules/basis/group/actions/basisGroupAction'; |
|
|
|
|
import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; |
|
|
|
|
import FlightPlanAprvGroupGrid from '../../../../components/basis/flight/aprv/FlightPlanAprvGroupGrid'; |
|
|
|
|
|
|
|
|
@ -35,7 +36,9 @@ const FlightPlanAprvContainer = () => {
|
|
|
|
|
aprvProc, |
|
|
|
|
selectGroup |
|
|
|
|
} = useSelector(state => state.flightState); |
|
|
|
|
const { joinList, joinListCount } = useSelector(state => state.groupState); |
|
|
|
|
const { joinList, joinListCount, groupList, groupListCount } = useSelector( |
|
|
|
|
state => state.groupState |
|
|
|
|
); |
|
|
|
|
const { user } = useSelector(state => state.authState, shallowEqual); |
|
|
|
|
const [modal, setModal] = useState({ |
|
|
|
|
isOpen: false, |
|
|
|
@ -154,12 +157,16 @@ const FlightPlanAprvContainer = () => {
|
|
|
|
|
}, []); |
|
|
|
|
useEffect(() => { |
|
|
|
|
if (user?.cstmrSno) { |
|
|
|
|
if (user.authId === 'SUPER' || user.authId === 'ADMIN') { |
|
|
|
|
dispatch(GROUP_LIST.request(user.cstmrSno)); |
|
|
|
|
} else { |
|
|
|
|
dispatch( |
|
|
|
|
JOIN_LIST.request({ |
|
|
|
|
cstmrSno: user?.cstmrSno |
|
|
|
|
}) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, [user]); |
|
|
|
|
useEffect(() => { |
|
|
|
|
if (aprvProc && aprvProc.result > 0) { |
|
|
|
@ -245,12 +252,29 @@ const FlightPlanAprvContainer = () => {
|
|
|
|
|
handleClickAprv={handleClickAprv} |
|
|
|
|
/> |
|
|
|
|
</Col> */} |
|
|
|
|
<Col sm='4'> |
|
|
|
|
{/* <Col sm='4'> |
|
|
|
|
<FlightPlanAprvGroupGrid |
|
|
|
|
data={joinList} |
|
|
|
|
count={joinListCount} |
|
|
|
|
columns={columns} |
|
|
|
|
/> |
|
|
|
|
</Col> */} |
|
|
|
|
<Col sm='4'> |
|
|
|
|
{user ? ( |
|
|
|
|
<> |
|
|
|
|
<FlightPlanAprvGroupGrid |
|
|
|
|
{...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' |
|
|
|
|
? { data: groupList } |
|
|
|
|
: { data: joinList })} |
|
|
|
|
{...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' |
|
|
|
|
? { count: groupListCount } |
|
|
|
|
: { count: joinListCount })} |
|
|
|
|
columns={columns} |
|
|
|
|
/> |
|
|
|
|
</> |
|
|
|
|
) : ( |
|
|
|
|
<></> |
|
|
|
|
)} |
|
|
|
|
</Col> |
|
|
|
|
<Col sm='8'> |
|
|
|
|
{selectGroup.cstmrSno !== 0 ? ( |
|
|
|
|