From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Fri, 13 Sep 2024 19:10:30 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master --- gz-customerSystem/src/components/personCard/DetailDialog.jsx | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gz-customerSystem/src/components/personCard/DetailDialog.jsx b/gz-customerSystem/src/components/personCard/DetailDialog.jsx index f241b8f..814f556 100644 --- a/gz-customerSystem/src/components/personCard/DetailDialog.jsx +++ b/gz-customerSystem/src/components/personCard/DetailDialog.jsx @@ -1,6 +1,8 @@ import React, { useEffect, useState } from 'react' import KeyVisits from "./KeyVisits"; -import { link } from '@/assets/images' +import { link } from '@/assets/images'; +import { Scrollbars } from "react-custom-scrollbars"; +import PreviewImage from '../PreviewImage'; export default function DetailDialog(props) { const nuturalList = [ @@ -124,17 +126,13 @@ [ { label: '登记企业材料', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />广东好又多餐饮有限公司营业执照.pdf - </a>, + value: '', isFile: true, field: 'file', }, { label: '法定代表人身份证明材料', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />江照月个人身份.pdf - </a>, + value: '', isFile: true, field: 'file1', }, @@ -189,17 +187,13 @@ [ { label: '机构登记材料', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />广东好又多餐饮有限公司营业执照.pdf - </a>, + value: '', isFile: true, field: 'file', }, { label: '机构代表人身份证明材料', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />江照月个人身份.pdf - </a>, + value: '', isFile: true, field: 'file1', }, @@ -290,17 +284,13 @@ [ { label: '身份证明材料', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />广东好又多餐饮有限公司营业执照.pdf - </a>, + value: '', isFile: true, field: 'file', }, { label: '代理人授权委托书', - value: <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />江照月个人身份.pdf - </a>, + value: '', isFile: true, field: 'file1', }, @@ -336,10 +326,15 @@ return { ...res, value: <> - {data[res.field].map(item => { - return <a target="_blank"> - <img src={link} alt="" className="title-file" />{item.name} - </a> + {data[res.field]?.map(item => { + console.log(item); + if(item.response) { + //新上传的,前端数据 + const data = item.response.data[0] + return <PreviewImage name={data.name} src={data.showUrl} /> + } else { + return <PreviewImage name={item.name} src={item.showUrl} /> + } })} </> } @@ -371,7 +366,12 @@ }, []) return ( - <div style={{ maxHeight: '590px', overflowY: 'scroll' }}> + <Scrollbars + autoHide + autoHeight + autoHeightMin={200} // 最小高度为300px + autoHeightMax={590} + > <table border="1" align="center" cellpadding="8" className="table" style={{ marginBottom: '20px' }}> { tableList?.map((item, index) => { @@ -394,9 +394,9 @@ } </table> {/* 重复来访重点人员 */} - <div style={{ width: 'calc(100% - 9px)', background: '#f2f3f5', marginBottom: '20px', padding: '12px' }}> + {/* <div style={{ width: 'calc(100% - 9px)', background: '#f2f3f5', marginBottom: '20px', padding: '12px' }}> <KeyVisits /> - </div> - </div> + </div> */} + </Scrollbars> ) } -- Gitblit v1.8.0