From b15ec4556a222875c49db7ebe75b599e16589576 Mon Sep 17 00:00:00 2001 From: xielei Date: Fri, 27 Sep 2024 10:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.less | 4 ++- src/views/sq/qzq/gcdsj/form.js | 6 ++-- src/views/sq/qzq/gcdsj/index.js | 4 +-- src/views/sq/qzq/qzqda/index.js | 4 +-- src/views/sz/flfg/form.js | 8 +++--- src/views/sz/szzf/ajdj/bajz.js | 4 +-- src/views/sz/szzf/ajdj/editTabs.js | 10 +++++-- src/views/sz/szzf/ajdj/lsyx.js | 4 +-- src/views/sz/szzf/clyj/treeSelectZdy.js | 37 +++++++++++++++++++++++-- src/views/sz/szzf/form/index.js | 3 +- src/views/sz/zdgl/form.js | 6 ++-- 11 files changed, 63 insertions(+), 27 deletions(-) diff --git a/src/index.less b/src/index.less index 6134098af..5be61d743 100644 --- a/src/index.less +++ b/src/index.less @@ -209,7 +209,9 @@ code { .flex-end{ justify-content: flex-end; } - +.align-center{ + align-items: center; +} .ellipsis1 { overflow:hidden;/*内容超出后隐藏*/ text-overflow:ellipsis;/*超出内容显示为省略号*/ diff --git a/src/views/sq/qzq/gcdsj/form.js b/src/views/sq/qzq/gcdsj/form.js index fe90f5787..77c62e48d 100644 --- a/src/views/sq/qzq/gcdsj/form.js +++ b/src/views/sq/qzq/gcdsj/form.js @@ -30,7 +30,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/projectEvents/file/download/${params}`; + downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -187,7 +187,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { { console.log(info.dataTransfer.files); }} fileList={fileList} @@ -286,7 +286,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { border: 0, marginTop: 20, }} - src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/projectEvents/file/download/${iframeSrc}`)}`} + src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`} /> diff --git a/src/views/sq/qzq/gcdsj/index.js b/src/views/sq/qzq/gcdsj/index.js index 247d96672..5280c466f 100644 --- a/src/views/sq/qzq/gcdsj/index.js +++ b/src/views/sq/qzq/gcdsj/index.js @@ -61,7 +61,7 @@ const Page = () => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/projectEvents/file/download/${params}`; + downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -213,7 +213,7 @@ const viewPdf = (params) => { border: 0, marginTop: 20, }} - src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/projectEvents/file/download/${iframeSrc}`)}`} + src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`} /> diff --git a/src/views/sq/qzq/qzqda/index.js b/src/views/sq/qzq/qzqda/index.js index 6f7762361..ab64cfc8c 100644 --- a/src/views/sq/qzq/qzqda/index.js +++ b/src/views/sq/qzq/qzqda/index.js @@ -38,7 +38,7 @@ const Page = () => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/xyt/projectEvents/file/download/${params}`; + downloadLink.href = `http://local.gunshiiot.com:18083/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -177,7 +177,7 @@ const onExport = () => { border: 0, marginTop: 20, }} - src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/xyt/projectEvents/file/download/${iframeSrc}`)}`} + src={`${process.env.PUBLIC_URL}/static/pdf/web/viewer.html?file=${encodeURIComponent(`/gunshiApp/tsg/projectEvents/file/download/${iframeSrc}`)}`} /> diff --git a/src/views/sz/flfg/form.js b/src/views/sz/flfg/form.js index 6bde3771c..cf617fbc1 100644 --- a/src/views/sz/flfg/form.js +++ b/src/views/sz/flfg/form.js @@ -78,7 +78,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { const onfinish = (values) => { - values.files = fileList.map(item => item.response?.data); + values.files = fileList.map(item => item.response?.data??item); // values.eventsDate = values.eventsDate ? moment(values.eventsDate).format("YYYY-MM-DD 00:00:00") : '' if (mode === 'edit') { @@ -144,7 +144,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { - { fileList.length > 0 && fileList.map(file => { return ( -
+
{file?.fileName?.indexOf('.docx') > -1 ?
{

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

-
+
{fileListHj?.[item1.key]?.map((item) => { - return
+ return
{checkMediaType(item.fileName) == 'image' && { +const Page = ({ mode, onCrudSuccess,record,submit }) => { const [formData,setFormData] =useState({}) // debugger; const [key, setKeys] = useState('1') @@ -40,6 +40,10 @@ const Page = ({ mode, onCrudSuccess,record }) => { setKeys(key) }; const getFormInfo = (e) => { + if(!e){ + submit() + return; + } let params = { ...formData, ...e, @@ -57,7 +61,7 @@ const Page = ({ mode, onCrudSuccess,record }) => { httppost(apiurl.szzf.ajdj.add, params).then(res => { if (res.code == 200) { message.success('新增成功') - onCrudSuccess() + submit() } else { message.error(res.description) } @@ -68,7 +72,7 @@ const Page = ({ mode, onCrudSuccess,record }) => { httppost(apiurl.szzf.ajdj.edit, params).then(res => { if (res.code == 200) { message.success('编辑成功') - onCrudSuccess() + submit() } else { message.error(res.description) } diff --git a/src/views/sz/szzf/ajdj/lsyx.js b/src/views/sz/szzf/ajdj/lsyx.js index 945a626c6..87c2a2ade 100644 --- a/src/views/sz/szzf/ajdj/lsyx.js +++ b/src/views/sz/szzf/ajdj/lsyx.js @@ -142,9 +142,9 @@ const Page = ({ uploadUrl, downloadUrl, type, getFormInfo, formJsonData }) => {

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

-
+
{fileListHj?.[item1.key]?.map((item) => { - return
+ return
{checkMediaType(item.fileName) == 'image' && { return loop(data); }, [searchValue, data]); + + const getFirstChild=(val)=> { + let res = {}; + if (JSON.stringify(res) != "{}") { + return;//如果res不再是空对象，退出递归 + } else { + //遍历数组 + for (let i = 0; i < val.length; i++) { + //如果当前的isleaf是true,说明是叶子节点，把当前对象赋值给res,并return，终止循环 + if (!val[i].children) { + res = val[i]; + break; + }else {//否则的话，递归当前节点的children + getFirstChild(val[i].children); + } + } + return res + } + } useEffect(() => { httpget(apiurl.szzf.clyj.tree).then(res => { setData(res.data) + // setTreeSelect( + // [{ + // key: res.data[0].id, + // name: res.data[0].legalName, + + // }] + + // ) + // setSelect([res.data[0].id]) + // getFirstChild(res.data) + + setSelect([getFirstChild(res.data).id]); setTreeSelect( [{ - key: res.data[0].id, - name: res.data[0].legalName, + key: getFirstChild(res.data).id, + name: getFirstChild(res.data).legalName, }] ) - setSelect([res.data[0].id]) + }) }, []) diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js index aa37ec8e5..c4521d3c5 100644 --- a/src/views/sz/szzf/form/index.js +++ b/src/views/sz/szzf/form/index.js @@ -71,7 +71,6 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for }, customRequest(e) { setFileLisUp([...fileListUp, e.file]) - debugger httppostAddfile(uploadUrl, e).then(res => { setFileList([...fileList, res.data]) }) @@ -271,7 +270,7 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for }
{fileList?.map((item) => { - return
+ return
{checkMediaType(item.fileName) == 'image' && { const onfinish = (values) => { - let oldFiles = fileList.map(item => (item.response?.data)) + let oldFiles = fileList.map(item => (item.response?.data??item)) debugger if (mode === 'edit') { values.files = oldFiles; @@ -138,7 +138,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { - @@ -191,7 +191,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { fileList.length > 0 && fileList.map(file => { return ( -
+
{file.name.indexOf('.docx') > -1 ?