diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js index 779aa3c2c..476254584 100644 --- a/src/views/sz/flfg/form.js +++ b/src/views/sz/flfg/form.js @@ -95,22 +95,22 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { * @param {string} id 删除的id */ const deleteFile = (fileId) => { - console.log(fileId); - let filterFile = fileList.filter(item => item.response?.data?.fileId !== fileId); + console.log(fileId,fileList); + let filterFile = fileList.filter(item => item.fileId !== fileId); setFileList(filterFile) } useEffect(() => { if (mode != 'save') { - // const imgFile = record?.files?.map(o => ({ - // name: o.name, - // response: { - // data: { - // filePath: o.filePath, - // fileId: o.fileId - // } - // }, - // })) - setFileList(record?.files) + const imgFile = record?.files?.map(o => ({ + name: o.fileName, + response: { + data: { + filePath: o.filePath, + fileId: o.fileId + } + }, + })) + setFileList(imgFile) } }, [record, mode]) @@ -232,6 +232,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {

} + {JSON.stringify(fileList)} { fileList.length > 0 && fileList.map(file => { @@ -239,9 +240,9 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
- {file?.fileName?.indexOf('.docx') > -1 ? + {file.name?.indexOf('.docx') > -1 ?
{ download(file.fileId) }} + onClick={() => { download(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} > { />
: - file?.fileName?.indexOf('.pdf') > -1 ? + file.name?.indexOf('.pdf') > -1 ?
{ viewPdf(file.fileId) }} + onClick={() => { viewPdf(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} >
: - file?.fileName?.indexOf('.zip') > -1 ? + file.name?.indexOf('.zip') > -1 ?
{ download(file.fileId) }} + onClick={() => { download(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} >
: - file?.fileName?.indexOf('.xlsx') > -1 ? + file.name?.indexOf('.xlsx') > -1 ?
{ download(file.fileId) }} + onClick={() => { download(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} >
: - + } - {file?.fileName} + {file.name}
-
deleteFile(file.fileId)}> +
deleteFile(file.response?.data?.fileId)}>
diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js index 431f620bf..c4d4ee5e0 100644 --- a/src/views/sz/szzf/ajdj/bajz.js +++ b/src/views/sz/szzf/ajdj/bajz.js @@ -37,6 +37,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []}) const [url, setUrl] = useState('') const [isModal, setIsModal] = useState(false) + const [loading, setLoading] = useState(false) + const getInfo = () => { form.validateFields().then((values) => { getFormInfo({ ...fileListHj,...values, }) @@ -72,8 +74,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { // } }, customRequest(e) { - + setLoading(true); httppostAddfile(uploadUrl, e).then(res => { + if(fileListHj[keys]){ fileListHj[keys].push(res.data) }else{ @@ -82,6 +85,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { } setFileHj({ ...fileListHj }) + setLoading(false); + }) } } @@ -202,7 +207,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { ))}
- +
diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js index c0caad98c..e7aab420a 100644 --- a/src/views/sz/szzf/ajdj/editTabs.js +++ b/src/views/sz/szzf/ajdj/editTabs.js @@ -34,6 +34,8 @@ const items = [ const Page = ({ mode, onCrudSuccess,record,submit }) => { const [formData,setFormData] =useState({}) const [clqkDataConfig,setConfig] =useState([]) + const [recordData,setRecord] =useState({}) + // debugger; const [key, setKeys] = useState('1') diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js index 87c2a2ade..f2e300932 100644 --- a/src/views/sz/szzf/ajdj/lsyx.js +++ b/src/views/sz/szzf/ajdj/lsyx.js @@ -26,6 +26,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { const [fileListHj, setFileHj] = useState({'files3': [],'files4': [],'files5': [],'files6': [],'files7': []}) const [url, setUrl] = useState('') const [isModal, setIsModal] = useState(false) + const [loading, setLoading] = useState(false) + const getInfo = () => { form.validateFields().then((values) => { getFormInfo({ ...values, ...fileListHj }) @@ -62,6 +64,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { // } }, customRequest(e) { + setLoading(true); httppostAddfile(uploadUrl, e).then(res => { if(fileListHj[keys]){ @@ -72,6 +75,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { } setFileHj({ ...fileListHj }) + setLoading(false); }) } } @@ -167,7 +171,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { ))}
- +
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js index 44b68d13a..fc05878a8 100644 --- a/src/views/sz/szzf/form/index.js +++ b/src/views/sz/szzf/form/index.js @@ -20,6 +20,8 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for const [fileListUp, setFileLisUp] = useState([]) const [url, setUrl] = useState('') const [isModal, setIsModal] = useState(false) + const [loading, setLoading] = useState(false) + // @@ -71,8 +73,9 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for } }, customRequest(e) { - setFileLisUp([...fileListUp, e.file]) + setLoading(true); httppostAddfile(uploadUrl, e).then(res => { + setLoading(false); setFileList([...fileList, res.data]) }) } @@ -102,9 +105,9 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for return null; } const preView = (item) => { - if (checkMediaType(item.name) == 'pdf') { + if (checkMediaType(item.fileName) == 'pdf') { // window.open(baseUrl + item.previewUrl) - setUrl(item.previewUrl) + setUrl(item.fileId) setIsModal(true) } @@ -305,10 +308,10 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for { type !== 'view' &&
- +
} - setIsModal(e)}/> + setIsModal(e)}/>
diff --git a/src/views/sz/szzf/form/pdfView.js b/src/views/sz/szzf/form/pdfView.js index 041c8f887..fa913aac4 100644 --- a/src/views/sz/szzf/form/pdfView.js +++ b/src/views/sz/szzf/form/pdfView.js @@ -26,6 +26,7 @@ const Pdf = ({ url,isModal,setModalN }) => { onOk={handleOk} footer={false} onCancel={handleCancel} + style={{ marginTop: "-5%" }} destroyOnClose>