From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 16:35:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/components/ImportModal.jsx | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rsf-admin/src/page/components/ImportModal.jsx b/rsf-admin/src/page/components/ImportModal.jsx index 703a018..caee07f 100644 --- a/rsf-admin/src/page/components/ImportModal.jsx +++ b/rsf-admin/src/page/components/ImportModal.jsx @@ -21,8 +21,8 @@ import { usePapaParse } from './usePapaParse'; import MatnrList from '../basicInfo/matnr/MatnrList'; import request from '@/utils/request' - -const ImportModal = ({ open, onClose, importTemp, useCodeImport, onceBatch = 10, value, parmas = {} }) => { +import ImportExportOutlinedIcon from '@mui/icons-material/ImportExportOutlined'; +const ImportModal = ({ open, onClose, importTemp, useCodeImport, onceBatch = 10, value, parmas = {}}) => { const refresh = useRefresh(); const translate = useTranslate(); @@ -57,17 +57,17 @@ } form.append('file', file); const { data: { code, data, msg } } = await request.post(`/${value}/import`, form) - if (code === 200) { handleClose() - } else { notify(msg); - + refresh() + } else { + handleClose() + notify(msg); + refresh() } }; - - const handleClose = () => { reset(); @@ -222,6 +222,7 @@ <Toolbar sx={{ width: '100%', + justifyContent: 'end' }} > {importer.state === 'idle' ? ( @@ -229,6 +230,8 @@ <Button label="common.action.import.title" variant="contained" + startIcon={<ImportExportOutlinedIcon />} + size='medium' onClick={startImport} disabled={!file} /> -- Gitblit v1.9.1