diff --git a/src/views/sq/qys/kqys/index.js b/src/views/sq/qys/kqys/index.js index 03526a7a4..68e6f7226 100644 --- a/src/views/sq/qys/kqys/index.js +++ b/src/views/sq/qys/kqys/index.js @@ -61,7 +61,7 @@ const Page = () => { x: 200, y: 60, width: '80%', - height: 'calc(100% - 100px)' + height: 'calc(100% - 200px)' }} >
diff --git a/src/views/sq/qzq/qzqda/index.js b/src/views/sq/qzq/qzqda/index.js index 539331a34..6668dac3f 100644 --- a/src/views/sq/qzq/qzqda/index.js +++ b/src/views/sq/qzq/qzqda/index.js @@ -49,7 +49,8 @@ const Page = () => { } const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.gcdsj.qzqda.list).find_noCode); - + console.log(tableProps); + /** * @description pdf文件预览 * @param {String} params 文件预览url @@ -62,6 +63,9 @@ const Page = () => { const onExport = () => { let params = { ...searchVal, + pageSo:{ + pageNum:1,pageSize:9999 + } } httppost5(apiurl.gcdsj.qzqda.export, params).then(res => { exportFile(`全周期档案.xlsx`,res.data) diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js index 249f45262..dbee0982e 100644 --- a/src/views/sz/szzf/ajdj/bajz.js +++ b/src/views/sz/szzf/ajdj/bajz.js @@ -4,6 +4,7 @@ import { useForm } from 'antd/lib/form/Form'; import { useEffect, useState } from 'react'; import { httpgetExport, httppostAddfile } from '../../../../utils/request'; import { exportFile } from '../../../../utils/tools'; +import PdfView from './pdfView' const { Dragger } = Upload; @@ -115,9 +116,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { 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) } @@ -209,6 +210,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {
+ setIsModal(e)}/> ) diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js index e7aab420a..36622e842 100644 --- a/src/views/sz/szzf/ajdj/editTabs.js +++ b/src/views/sz/szzf/ajdj/editTabs.js @@ -93,32 +93,22 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { }) } useEffect(()=>{ + let obj = { + createName: localStorage.getItem('userName'), + createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), + createBy:localStorage.getItem('userId') + } if(mode == 'edit' || mode =='view'){ httpget(apiurl.szzf.ajdj.detail + record.id).then(async res=>{ - - let obj = { - createName: localStorage.getItem('userName'), - createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), - createBy:localStorage.getItem('userId') - } if(res.data?.caseDate){ obj.caseDate=dayjs(res.data.caseDate) } if(res.data?.illegalDate){ obj.illegalDate=dayjs(res.data.illegalDate) - } - // if(res.data.IllegalDate){ - // obj.IllegalDate = dayjs(res.data.IllegalDate) - // } - + } setFormData({...res.data,...obj}) }) }else if(mode == 'save'){ - let obj = { - createName: localStorage.getItem('userName'), - createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), - createBy:localStorage.getItem('userId'), - } setFormData({...obj}) } diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js index 45f6031f5..36577e03c 100644 --- a/src/views/sz/szzf/ajdj/lsyx.js +++ b/src/views/sz/szzf/ajdj/lsyx.js @@ -4,6 +4,7 @@ import { useForm } from 'antd/lib/form/Form'; import { useEffect, useState } from 'react'; import { httpgetExport, httppostAddfile } from '../../../../utils/request'; import { exportFile } from '../../../../utils/tools'; +import PdfView from './pdfView' const { Dragger } = Upload; @@ -104,9 +105,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { 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) } @@ -173,6 +174,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { + setIsModal(e)}/> ) diff --git a/src/views/sz/szzf/ajdj/pdfView.js b/src/views/sz/szzf/ajdj/pdfView.js new file mode 100644 index 000000000..fa913aac4 --- /dev/null +++ b/src/views/sz/szzf/ajdj/pdfView.js @@ -0,0 +1,47 @@ +import React, { Component, useEffect, useState } from 'react'; +import { Document, Page, pdfjs } from 'react-pdf'; +import { Modal } from 'antd'; + +const Pdf = ({ url,isModal,setModalN }) => { + const [isModalOpen, setIsModalOpen] = useState(false); + + const handleOk = () => { + setIsModalOpen(false); + setModalN(false) + }; + + const handleCancel = () => { + setIsModalOpen(false); + setModalN(false) + }; + useEffect(()=>{ + setIsModalOpen(isModal) + },[isModal]) + return ( +
+ pdf
} + open={isModalOpen} + width={1000} + onOk={handleOk} + footer={false} + onCancel={handleCancel} + style={{ marginTop: "-5%" }} + destroyOnClose> +
+