From 632bb5a9a0f07c01ffba53e9009d69c4a50c2bd7 Mon Sep 17 00:00:00 2001 From: yangyang Date: 星期五, 21 三月 2025 12:50:01 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 12 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx index 46c4d0d..4bb496e 100644 --- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx +++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx @@ -29,11 +29,11 @@ TextField, Box, Button, - Paper, - TableContainer, - Table, - TableHead, - TableBody, + Radio, + RadioGroup, + FormControlLabel, + FormControl, + FormLabel, TableRow, TableCell, Tooltip, @@ -52,15 +52,14 @@ import { DataGrid } from '@mui/x-data-grid'; import StatusSelectInput from "../../components/StatusSelectInput"; - +import { useReactToPrint } from "react-to-print"; const InitModal = ({ open, setOpen }) => { const refresh = useRefresh(); const translate = useTranslate(); - - const notify = useNotify(); - + const contentRef = useRef(null); + const reactToPrintFn = useReactToPrint({ contentRef }); const handleClose = (event, reason) => { if (reason !== "backdropClick") { @@ -68,16 +67,45 @@ } }; + const [value, setValue] = useState('temp1'); + + const handleChange = (event) => { + setValue(event.target.value); + }; + + const handlePrint = () => { + // handleClose() + reactToPrintFn() + }; + return ( <Dialog open={open} maxWidth="sm" fullWidth> <DialogCloseButton onClose={handleClose} /> <DialogTitle>{translate('toolbar.print')}</DialogTitle> - <DialogContent sx={{ mt: 2 }}> - 1 + <DialogContent > + <FormControl > + <RadioGroup + row + aria-labelledby="demo-controlled-radio-buttons-group" + name="controlled-radio-buttons-group" + value={value} + onChange={handleChange} + size="small" + sx={{ justifyContent: 'center' }} + > + <FormControlLabel value="temp1" control={<Radio />} label="妯℃澘1" size="small" /> + </RadioGroup> + </FormControl> + + <Box> + <div ref={contentRef}> + 11 + </div> + </Box> </DialogContent> <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}> <Box sx={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}> - <Button onClick={handleClose} variant="contained" startIcon={<SaveIcon />}> + <Button onClick={handlePrint} variant="contained" startIcon={<SaveIcon />}> {translate('toolbar.confirm')} </Button> </Box> -- Gitblit v1.9.1