fix: 심사자 심의 화면 구성 반영

main
Lim Jonguk 3 years ago
parent 5fba003dd9
commit 43507632ab

@ -211,8 +211,8 @@ const JudgeDataModifyForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSav
onChange={(e) => setSelectedContDoc(e?.target?.value)} onChange={(e) => setSelectedContDoc(e?.target?.value)}
> >
{contDocs && {contDocs &&
contDocs.map((contDoc) => ( contDocs.map((contDoc, idx) => (
<MenuItem key={contDoc.code} value={contDoc.code}> <MenuItem key={idx} value={contDoc.code}>
{contDoc.value} {contDoc.value}
</MenuItem> </MenuItem>
))} ))}

@ -152,8 +152,8 @@ const JudgeDataNewForm = ({ scDatagb, contDocs, ingbs, handleModalSave }) => {
onChange={(e) => setSelectedContDoc(e?.target?.value)} onChange={(e) => setSelectedContDoc(e?.target?.value)}
> >
{contDocs && {contDocs &&
contDocs.map((contDoc) => ( contDocs.map((contDoc, idx) => (
<MenuItem key={contDoc.code} value={contDoc.code}> <MenuItem key={idx} value={contDoc.code}>
{contDoc.value} {contDoc.value}
</MenuItem> </MenuItem>
))} ))}

@ -14,7 +14,7 @@ import MainCard from 'ui-component/cards/MainCard';
// project imports // project imports
import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid'; import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid';
import { findByUserJudges } from 'apis/judge'; import { findByUserJudges } from 'apis/judge';
import CmmModal from 'views/cmm/CmmModal'; import CmmFullModal from 'views/cmm/CmmFullModal';
import ProcessJudge from './ProcessJudge'; import ProcessJudge from './ProcessJudge';
import useAuth from 'hooks/useAuth'; import useAuth from 'hooks/useAuth';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
@ -222,9 +222,9 @@ const JudgeByUserReview = ({ msDatagb, menuName }) => {
// handleSelection={handleSelection} // handleSelection={handleSelection}
// selectionModel={selectionModel} // selectionModel={selectionModel}
/> />
<CmmModal isBackdrop title={title} open={open} setOpen={setOpen}> <CmmFullModal isBackdrop title={title} open={open} setOpen={setOpen}>
<ProcessJudge setTitle={setTitle} rowDatas={rowDatas} showAlert={showAlert} setOpen={setOpen} /> <ProcessJudge setTitle={setTitle} rowDatas={rowDatas} showAlert={showAlert} setOpen={setOpen} />
</CmmModal> </CmmFullModal>
</MainCard> </MainCard>
); );
}; };

@ -13,7 +13,7 @@ import MainCard from 'ui-component/cards/MainCard';
// project imports // project imports
import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid'; import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid';
import { findByUserJudges } from 'apis/parking'; import { findByUserJudges } from 'apis/parking';
import CmmModal from 'views/cmm/CmmModal'; import CmmFullModal from 'views/cmm/CmmFullModal';
import ProcessParkingJudge from './ProcessParkingJudge'; import ProcessParkingJudge from './ProcessParkingJudge';
import useAuth from 'hooks/useAuth'; import useAuth from 'hooks/useAuth';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
@ -222,9 +222,9 @@ const ParkingJudgeByUserReview = () => {
// handleSelection={handleSelection} // handleSelection={handleSelection}
// selectionModel={selectionModel} // selectionModel={selectionModel}
/> />
<CmmModal isBackdrop title={title} open={open} setOpen={setOpen}> <CmmFullModal isBackdrop title={title} open={open} setOpen={setOpen}>
<ProcessParkingJudge setTitle={setTitle} rowDatas={rowDatas} showAlert={showAlert} setOpen={setOpen} /> <ProcessParkingJudge setTitle={setTitle} rowDatas={rowDatas} showAlert={showAlert} setOpen={setOpen} />
</CmmModal> </CmmFullModal>
</MainCard> </MainCard>
); );
}; };

@ -66,6 +66,8 @@ const ProcessJudge = (props) => {
return ( return (
<> <>
<Grid container spacing={1}>
<Grid item xs={6.5}>
<Grid container spacing={1}> <Grid container spacing={1}>
{picadImgs?.map((img, idx) => ( {picadImgs?.map((img, idx) => (
<Grid item xs={3} key={idx}> <Grid item xs={3} key={idx}>
@ -107,6 +109,14 @@ const ProcessJudge = (props) => {
</Grid> </Grid>
))} ))}
</Grid> </Grid>
</Grid>
<Grid item xs={5.5}>
<Grid container spacing={1}>
<Grid item xs={12}>
<h1>진행중...</h1>
</Grid>
</Grid>
</Grid>
<Grid container m={1}> <Grid container m={1}>
<Grid item xs={12}> <Grid item xs={12}>
<Divider /> <Divider />
@ -160,6 +170,7 @@ const ProcessJudge = (props) => {
/> />
</Grid> </Grid>
</Grid> </Grid>
</Grid>
<Grid container spacing={1} m={0.5}> <Grid container spacing={1} m={0.5}>
<Grid item xs={12}> <Grid item xs={12}>
<Divider /> <Divider />

@ -0,0 +1,57 @@
import PropTypes from 'prop-types';
import Modal from '@mui/material/Modal';
import { IconButton } from '@mui/material';
import CloseOutlined from '@mui/icons-material/CloseOutlined';
import MainCard from 'ui-component/cards/MainCard';
const style = {
position: 'relative',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
width: '98%',
minHeight: '98%',
bgcolor: 'background.paper',
border: '2px solid #000',
boxShadow: 24,
p: 3
};
const CmmFullModal = ({ isBackdrop = false, open, setOpen, title, children, callback = () => {} }) => {
const handleClose = () => {
if (callback) callback();
setOpen(false);
};
return (
<div className="modalGroup">
{/* <Button onClick={handleOpen}>Grid Modal(List)</Button> */}
<Modal hideBackdrop={isBackdrop} open={open} aria-labelledby="modal-modal-title" aria-describedby="modal-modal-description">
<MainCard
sx={style}
title={title}
content
secondary={
<IconButton size="small" variant="rounded" onClick={handleClose}>
<CloseOutlined fontSize="small" />
</IconButton>
}
>
{children}
</MainCard>
</Modal>
</div>
);
};
CmmFullModal.propTypes = {
isBackdrop: PropTypes.bool,
open: PropTypes.bool,
title: PropTypes.string,
children: PropTypes.node,
setOpen: PropTypes.func,
callback: PropTypes.func
};
export default CmmFullModal;
Loading…
Cancel
Save