From a7cba2f05df12ab546ef1c20b63aad10ec0e7a5c Mon Sep 17 00:00:00 2001 From: liyj <1003249715@qq.com> Date: Fri, 30 Aug 2024 16:45:54 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh --- gz-customerSystem/src/views/register/visit/preview.jsx | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx index 079d2c4..6b201ec 100644 --- a/gz-customerSystem/src/views/register/visit/preview.jsx +++ b/gz-customerSystem/src/views/register/visit/preview.jsx @@ -2,7 +2,7 @@ * @Author: dminyi 1301963064@qq.com * @Date: 2024-08-13 15:19:57 * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-08-19 11:42:52 + * @LastEditTime: 2024-08-28 11:42:44 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx * @Description: 预览信息 */ @@ -14,12 +14,13 @@ import { Modal } from '@arco-design/web-react'; import NewFileCheck from '../../filesCheck/newFileCheck'; import * as $$ from '../../../utils/utility'; +import { EventLevelDrawer, MattersDetail } from './component/levelDetail' - -const Preview = () => { +const Preview = (props) => { const [filesCheck, setFilesCheck] = useState(false); - + const [apply, setApply] = useState(false); + const [visible, setVisible] = useState(false); const fakeData1 = [ { @@ -127,10 +128,10 @@ return ( - <div style={{ backgroundColor: '#ffff', margin: '8px 16px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 211px)', overflowY: 'scroll' }}> - <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}> + <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', ...props.style }}> + <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>当事人信息</h4> </Space> </Col> <div style={{ marginBottom: '8px' }}>申请方</div> @@ -277,15 +278,17 @@ </td> </tr> </table> - <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}> + <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>纠纷基本情况</h4> </Space> </Col> <Row gutter={[16, 16]}> <Col span={8}> - <div className="title"><div className="title-text">事项等级</div><img src={question} alt="" style={{ width: '14px', height: '14px', marginTop: '4px', marginLeft: '4px' }} /></div> - <div style={{ display: 'flex' }}><div style={{ backgroundColor: '#1A6FB8', marginRight: '4px', borderRadius: '4px' }}><div style={{ color: '#FFFFFF', padding: '0px 6px' }}>3</div></div>级</div> + <div className="title"> + <div className="title-text">事项等级</div> + </div> + <div style={{ display: 'flex' }}><div style={{ backgroundColor: '#00B42A', marginRight: '4px', borderRadius: '4px' }}><div style={{ color: '#FFFFFF', padding: '0px 6px' }}>3</div></div>级</div> </Col> <Col span={8}> <div><div className="title-text">来访时间</div></div> @@ -328,11 +331,11 @@ <div>来访</div> </Col> <Col span={24}> - <div className="title"><div className="title-text">事项概况</div><img src={question} alt="" style={{ width: '14px', height: '14px', marginTop: '4px', marginLeft: '4px' }} /></div> + <div className="title"><div className="title-text">事项概况</div></div> <div>张先生与李先生是多年的朋友关系。2023年4月,李先生因生意周转需要向张先生借款人民币20万元,并口头承诺于一年内还清。出于信任,张先生未要求签订书面借条或借款合同。然而,到了2024年4月,李先生并未如约归还借款。张先生多次通过电话、微信等方式催促还款,但李先生先是拖延,后干脆以各种理由拒绝偿还,甚至声称该笔款项属于赠予而非借款,这使得张先生感到十分无奈。 </div> </Col> <Col span={24}> - <div className="title"><div className="title-text">事项申请</div><img src={question} alt="" style={{ width: '14px', height: '14px', marginTop: '4px', marginLeft: '4px' }} /></div> + <div className="title"><div className="title-text">事项申请</div></div> <div>张先生与李先生是多年的朋友关系。2023年4月,李先生因生意周转需要向张先生借款人民币20万元,并口头承诺于一年内还清。出于信任,张先生未要求签订书面借条或借款合同。然而,到了2024年4月,李先生并未如约归还借款。张先生多次通过电话、微信等方式催促还款,但李先生先是拖延,后干脆以各种理由拒绝偿还,甚至声称该笔款项属于赠予而非借款,这使得张先生感到十分无奈。 </div> </Col> <Col span={16}> @@ -342,7 +345,7 @@ </Row> <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>事件材料</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4> </Space> </Col> @@ -357,7 +360,7 @@ <Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered> {/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */} - <div style={{marginTop:'-16px'}}> + <div style={{ marginTop: '-16px' }}> <NewFileCheck /> </div> @@ -365,6 +368,7 @@ </Modal> + </div> ) } -- Gitblit v1.8.0