diff --git a/package-lock.json b/package-lock.json index edc80604d..33e93785d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,6 +50,7 @@ "react-cookies": "^0.1.1", "react-dom": "^18.2.0", "react-konva": "^18.2.3", + "react-org-tree": "^1.0.1", "react-pdf": "^7.3.3", "react-redux": "^8.0.2", "react-rnd": "^10.4.11", @@ -18883,6 +18884,14 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, + "node_modules/react-org-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/react-org-tree/-/react-org-tree-1.0.1.tgz", + "integrity": "sha512-NK1d8VIAzxJyMC/Rx9MupAusoFnokYr81Hw3oEpqxqBLQmpBVAexjvPSAJmhCmsom9Zymu+BMNrjRw5D54n7aw==", + "dependencies": { + "classnames": "^2.2.6" + } + }, "node_modules/react-pdf": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.3.3.tgz", diff --git a/package.json b/package.json index a6b4baed4..64205078a 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "react-cookies": "^0.1.1", "react-dom": "^18.2.0", "react-konva": "^18.2.3", + "react-org-tree": "^1.0.1", "react-pdf": "^7.3.3", "react-redux": "^8.0.2", "react-rnd": "^10.4.11", diff --git a/public/assets/images/four.png b/public/assets/images/four.png index d114e6bdc..edde7a8f0 100644 Binary files a/public/assets/images/four.png and b/public/assets/images/four.png differ diff --git a/public/assets/images/three.png b/public/assets/images/three.png index 036378594..2e587b942 100644 Binary files a/public/assets/images/three.png and b/public/assets/images/three.png differ diff --git a/src/components/crud/_.js b/src/components/crud/_.js index 005fec4e0..1cf029846 100644 --- a/src/components/crud/_.js +++ b/src/components/crud/_.js @@ -156,6 +156,11 @@ export function createCrudService(urlSet) { const resData = await httppost2(urlSet, params) || {}; return resData; } + + const edit1 = async (params) => { + const resData = await httppost2(urlSet, params) || {}; + return resData; + } const insert = async (params) => { const resData = await httppost2(urlSet + `/${params}`) || {}; return resData; @@ -241,6 +246,7 @@ export function createCrudService(urlSet) { todo: todo, save: save, edit: edit, + edit1: edit1, del: del, insert:insert, delGet:delGet, diff --git a/src/models/auth/_.ts b/src/models/auth/_.ts index 95250e6fa..e2dcdf0ed 100644 --- a/src/models/auth/_.ts +++ b/src/models/auth/_.ts @@ -289,8 +289,9 @@ export async function loadMenu(): Promise { } ] }, - { id: id(), title: '法律法规', path: '/mgr/sz/flfg' }, { id: id(), title: '制度管理', path: '/mgr/sz/zdgl' }, + { id: id(), title: '法律法规', path: '/mgr/sz/flfg' }, + ] }, diff --git a/src/service/apiurl.js b/src/service/apiurl.js index cac4b22bf..0d2564764 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -914,7 +914,7 @@ const apiurl = { reservoirsummaryInfo: service_fxdd + '/reservoir/water/summaryInfo', //实时水情-水库水情汇总 //河道弹框详情 monitor: service_fxdd + '/river/water/monitor/data', //监测数据 - detail: service_fxdd + '/river/water/detail', //监测数据-下方表格 + detail: service_fxdd + '/reservoir/water/detail', //监测数据-下方表格 zqrl: service_fxdd + '/river/water/zqrl', //水位流量关系 channel: service_fxdd + '/reservoir/water/image/channel', //图像监测-视角 imageinfo: service_fxdd + '/reservoir/water/image/info', //图像监测-列表 diff --git a/src/service/sssq.js b/src/service/sssq.js index 7c043eb0a..021323409 100644 --- a/src/service/sssq.js +++ b/src/service/sssq.js @@ -23,9 +23,9 @@ export async function reservoirlist(params) { if (code !== 200) { message.error(msg || '请求失败'); } - const list = data?.filter(o => o.lgtd && o.lttd) + // const list = data?.filter(o => o.lgtd && o.lttd) - return list; + return data; } diff --git a/src/views/gcaqjc/bzt/index.less b/src/views/gcaqjc/bzt/index.less index 7a5ebeb7e..53af75a1f 100644 --- a/src/views/gcaqjc/bzt/index.less +++ b/src/views/gcaqjc/bzt/index.less @@ -29,7 +29,7 @@ top: 30px; border-radius: 5px; border: 1px solid #eee; - transition: all 0.2s ease 0s; + .ant-tabs-nav{ margin-bottom: 5px; diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js index 4fd48a546..b25aeda2f 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/index.js +++ b/src/views/gcaqjc/gcaqfx/jrx/index.js @@ -90,8 +90,8 @@ export default function Xmzlmb() { ...obj, } }) - let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试 最后需要删除 - setDateSources(res1) + // let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试 最后需要删除 + setDateSources(result) } catch (error) { console.log(error); } diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js index 2b8de4a64..5900a5c83 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js +++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js @@ -35,12 +35,12 @@ const textColor = '#666' []; const gz3 = data[alltype[2]] ? - type == "1" ? [[73, 161], [73, data[alltype[2]]]] : + type == "1" ? [[72.5, 161], [72.5, data[alltype[2]]]] : type == "2" ? [[66.5, 162], [66.5, data[alltype[2]]]] : [[73, 161], [73, data[alltype[2]]]] : []; const gz4 = data[alltype[3]] ? - type == "1" ? [[85, 166], [85, data[alltype[3]]]] : + type == "1" ? [[84.5, 166], [84.5, data[alltype[3]]]] : type == "2" ? [[77, 161], [77, data[alltype[3]]]] : [[85, 166], [85, data[alltype[3]]]] : []; @@ -50,8 +50,8 @@ const textColor = '#666' [xValue, data?.rz], [51.6, data[alltype[0]]], [53.6, data[alltype[1]]], - [73, data[alltype[2]]], - [85, data[alltype[3]]] + [72.5, data[alltype[2]]], + [84.5, data[alltype[3]]] ] : type == "2" ? [ diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js index 672c17d31..d341555a2 100644 --- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js +++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js @@ -110,7 +110,7 @@ const EditableRow = ({ index, ...props }) => { title: '标准分数', key: 'standardScore', dataIndex: 'standardScore', - width: 60, + width: 70, align: "center", }, { @@ -380,12 +380,20 @@ const EditableRow = ({ index, ...props }) => { setClickItem(record) } const handleRadioChange = (e) => { - if (e.target.value == 1) { - setTableData(tableDataRef.current) + if (e.target.value == 1) { + if (tabs == 2) { + getQdViewData(Item?.id) } else { - const newData = tableData.filter(item => item.standardScore > item.assessScore) - setTableData(newData); + getZbTableData(Item?.id,2) } + } else { + const newData = tableData.filter(item => item.standardScore > item.assessScore) + newData.forEach(item => { + if (item.rowSpan) delete item.rowSpan; + }) + const res = handleData(newData, "name") + setTableData(res); + } } // 整改 diff --git a/src/views/rcgl/jdkh/khrwgl/mbForm.js b/src/views/rcgl/jdkh/khrwgl/mbForm.js index 4d284ce64..355f46d81 100644 --- a/src/views/rcgl/jdkh/khrwgl/mbForm.js +++ b/src/views/rcgl/jdkh/khrwgl/mbForm.js @@ -1,5 +1,5 @@ import React,{useEffect,useState,useMemo,useRef} from 'react'; -import { Form, Button, Input, Row,Table, Col, Popconfirm, InputNumber,Image,Modal,Typography, message} from 'antd'; +import { Form, Button, Input, Row,Table, Col, Tooltip, InputNumber,Image,Modal,Typography, message} from 'antd'; import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons'; import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps'; import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request'; @@ -27,6 +27,16 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { dataIndex: 'indicatorName', width: 250, align: "center", + render: (v, r) => { + const titleDom = r.indicatorRatings ? + r.indicatorRatings.map((item,i) =>
{item?.ratingDesc} ({item?.standardScore})
) + : '' + return ( + + {v} + + ) + } }, { title: '标准分数', diff --git a/src/views/sq/qys/xyys/index.js b/src/views/sq/qys/xyys/index.js index e57603759..0066551c8 100644 --- a/src/views/sq/qys/xyys/index.js +++ b/src/views/sq/qys/xyys/index.js @@ -11,8 +11,13 @@ const Page = () => { 保护对象
- 水库防洪标准按50年一遇设计，1000年一遇校核，设计洪水位111.51米，校核洪水位 112.75 米,水库担负着红安县城、七里坪、杏花、城关等城镇，以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口32万 - 人，保护耕地 15 万亩。 + 水库防洪标准按 + 50 + 年一遇设计，1000年一遇校核，设计洪水位111.51米， + 校核洪水位 112.75 米, + 水库担负着红安县城、七里坪、杏花、城关等城镇， + 以及京九铁路汉麻连络线、省道S234、国道G230,京九铁路汉麻联络线等交通设施安全的防洪重任、防洪保护人口32万 + 人，保护耕地 15 万亩。
diff --git a/src/views/sq/qys/xyys/index.module.less b/src/views/sq/qys/xyys/index.module.less index a40672f86..024ac9dff 100644 --- a/src/views/sq/qys/xyys/index.module.less +++ b/src/views/sq/qys/xyys/index.module.less @@ -7,4 +7,7 @@ .content{ font-size: 17px; padding: 0 20px; +} +.color{ + color: #409eff; } \ No newline at end of file diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js index cf617fbc1..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]) @@ -223,6 +223,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { onDrop={(info) => { console.log(info.dataTransfer.files); }} fileList={fileList} disabled={loading} + maxCount={1} // onSuccess={handleSuccess} >

点击或拖拽文件到此区域上传

@@ -231,6 +232,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {

} + {JSON.stringify(fileList)} { fileList.length > 0 && fileList.map(file => { @@ -238,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/flfg/index.js b/src/views/sz/flfg/index.js index 98efb74d8..8630c4ad5 100644 --- a/src/views/sz/flfg/index.js +++ b/src/views/sz/flfg/index.js @@ -48,7 +48,7 @@ const Page = () => { title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate' }, { - title: '上传时间', key: 'eventsDesc', dataIndex: 'eventsDesc' + title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate' }, { title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=>download(v[0].fileId,v[0]?.fileName)}>{v[0]?.fileName} diff --git a/src/views/sz/szzf/ajdj/bajz.js b/src/views/sz/szzf/ajdj/bajz.js index de67107dd..249f45262 100644 --- a/src/views/sz/szzf/ajdj/bajz.js +++ b/src/views/sz/szzf/ajdj/bajz.js @@ -37,10 +37,11 @@ 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 }) - form.resetFields() + getFormInfo({ ...fileListHj,...values, }) setFileList([]) }).catch((errorInfo) => { console.log(errorInfo, 'error'); @@ -73,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{ @@ -83,6 +85,8 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { } setFileHj({ ...fileListHj }) + setLoading(false); + }) } } @@ -131,7 +135,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { } useEffect(() => { + setFileHj(formJsonData) + form.setFieldsValue(formJsonData) }, []) return (
@@ -146,7 +152,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { label='保管人员' name='custodian' > - + @@ -154,7 +160,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { label='保管地点' name='storageLocation' > - + @@ -170,12 +176,12 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { label='附件' name='files' > - + {type !== 'view' &&

点击或将文件拖拽到这里上传 支持扩展名：jpeg、png

- + }
{fileListHj?.[item1.key]?.map((item) => { return
@@ -201,7 +207,7 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { ))}
- +
diff --git a/src/views/sz/szzf/ajdj/config.js b/src/views/sz/szzf/ajdj/config.js index dbaf3378f..0cd4f13be 100644 --- a/src/views/sz/szzf/ajdj/config.js +++ b/src/views/sz/szzf/ajdj/config.js @@ -1,4 +1,85 @@ +const treeData = [ + { + value: '行政处理', + title: '行政处理', + children: [ + { + value: '责令停止违法行为', + title: '责令停止违法行为', + }, + { + value: '责令补办许可手续', + title: '责令补办许可手续', + }, + { + value: '责令限期拆除', + title: '责令限期拆除', + }, + { + value: '责令采取补救措施', + title: '责令采取补救措施', + }, + { + value: '责令停止施工', + title: '责令停止施工', + }, + { + value: '责令赔偿损失', + title: '责令赔偿损失', + }, + ], + }, + { + value: '行政处罚', + title: '行政处罚', + children: [ + { + value: '警告', + title: '警告', + }, + { + value: '罚款', + title: '罚款', + }, + { + value: '没收违法所得、非法财产', + title: '没收违法所得、非法财产', + }, + { + value: '责令停产停业', + title: '责令停产停业', + }, + { + value: '暂扣许可证、执照', + title: '暂扣许可证、执照', + }, + { + value: '吊销许可证、执照', + title: '吊销许可证、执照', + }, + + ], + }, + { + value: '行政强制措施', + title: '行政强制措施', + children: [ + { + value: '查封或扣押设施', + title: '查封或扣押设施', + }, + { + value: '查封或扣罚财务', + title: '查封或扣罚财务', + }, + { + value: '其他', + title: '其他', + }, + ], + }, + ]; const basicData = [ { label: '填报人', @@ -76,7 +157,7 @@ const basicData = [ }, { label: '违法时间', - key: 'IllegalDate', + key: 'illegalDate', type: 'DatePicker', span: 12 }, @@ -144,14 +225,17 @@ const clqkData = [ { label: '处理依据', key: 'treatmentBasis', - type: 'input', + type: 'TreeSelect', span: 12, + treeData:[], + fieldNames:{label: 'legalName', value: 'legalName', children: 'children'} }, { label: '处理措施', key: 'treatmentMeasure', - type: 'Select', - span: 12 + type: 'TreeSelect', + span: 12, + treeData:treeData }, { label: '移送处理情况', @@ -188,6 +272,7 @@ const clqkData = [ { label: '直接损失金额(万元)', key: 'directLossAmount', + labelCol:{span:7}, type: 'input', span: 12 }, diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js index 32375b388..e7aab420a 100644 --- a/src/views/sz/szzf/ajdj/editTabs.js +++ b/src/views/sz/szzf/ajdj/editTabs.js @@ -33,11 +33,25 @@ 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') - const onChange = (key) => { + const onChange = async(key) => { console.log(key); setKeys(key) + if(key == 2){ + const res = await httpget(apiurl.szzf.clyj.tree) + const arr = clqkData.map(item=>{ + if(item.key == 'treatmentBasis'){ + item.treeData = res.data + } + return item + }) + setConfig(arr) + } }; const getFormInfo = (e) => { if(!e){ @@ -48,7 +62,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { ...formData, ...e, caseDate: dayjs(e.caseDate).format("YYYY-MM-DD HH:mm:ss"), - IllegalDate: e.IllegalDate ? dayjs(e.IllegalDate).format("YYYY-MM-DD HH:mm:ss") : e.IllegalDate, + illegalDate: e.illegalDate ? dayjs(e.v).format("YYYY-MM-DD HH:mm:ss") : e.illegalDate, } if (mode == 'save') { @@ -80,7 +94,8 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { } useEffect(()=>{ if(mode == 'edit' || mode =='view'){ - httpget(apiurl.szzf.ajdj.detail + record.id).then(res=>{ + 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'), @@ -89,12 +104,12 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { 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) + if(res.data?.illegalDate){ + obj.illegalDate=dayjs(res.data.illegalDate) } + // if(res.data.IllegalDate){ + // obj.IllegalDate = dayjs(res.data.IllegalDate) + // } setFormData({...res.data,...obj}) }) @@ -113,7 +128,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { <> {key == 1 && } - {key == 2 && } + {key == 2 && } {key == 3 && } {key == 4 && } {key == 5 && } diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js index 87c2a2ade..45f6031f5 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); }) } } @@ -136,12 +140,12 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => { label='附件' name='files' > - + {type !== 'view'&&

点击或将文件拖拽到这里上传 支持扩展名：jpeg、png

- + }
{fileListHj?.[item1.key]?.map((item) => { return
@@ -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 fa6d2c31a..bf4dc8b57 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) } @@ -166,6 +169,7 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for @@ -247,11 +251,11 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for showSearch style={{ width: '100%' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} - placeholder="Please select" allowClear fieldNames={item.fieldNames} treeData={item.treeData} treeCheckable={item.multiple} + disabled={type == 'view'} /> } @@ -304,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>