From 3c3ac0c2c225f763fffb05ad669d76b50b4f6e45 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 06 Sep 2024 16:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/matterDetail/index.jsx | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 403d0c3..e607ee9 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -11,7 +11,7 @@
}
-export default function MatterDetali() {
+export default function MatterDetail(props) {
const [fakeData, setFakeData] = useState([{
"trueName": "王大锤",
"mobile": "13380313412",
@@ -151,32 +151,34 @@
if (res.type) {
let data = res.data
- setInfoData([...fakeData1, {
+ setInfoData({
...data,
- questionName: data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName + '/' + data.queVillageName,
- caseType: data.caseTypeFirstName + '/' + data.caseTypeName
- }])
-
+ questionName: data.queProvName === null ? '-' : data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName + '/' + data.queVillageName,
+ caseType: data.caseTypeFirstName === null ? '-' : data.caseTypeFirstName + '/' + data.caseTypeName
+ })
+ setFakeData(data.personList.concat(data.agentList))
}
+
}
- useEffect(() => {
- getCaseInfo()
- }, [])
+ // useEffect(() => {
+ // getCaseInfo()
+ // }, [])
return (
<div style={{ position: 'relative' }}>
<Typography.Paragraph>
- <div className='dataSync-page'>
+ <div className='dataSync-noScrollPage'>
<Col span={24} style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
</Space>
- <div>
+ {props.hasApplet && <div>
<Switch checkedChildren="当事人小程序可见" unCheckedChildren="当事人小程序不可见" defaultChecked />
</div>
+ }
</Col>
<div style={{ margin: '16px 0' }}>
<PersonCard
@@ -184,7 +186,7 @@
data={fakeData}
/>
</div>
- <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
+ <Col span={24} className='title'>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5>
</Space>
@@ -192,11 +194,11 @@
<Row gutter={[16, 16]}>
<Col span={8}>
<div><div className="title-text">事项状态</div></div>
- <div style={{ color: '#1A6FB8' }}>{infoData.statusName || '-'}</div>
+ <div style={{ color: '#1A6FB8' }}>{infoData?.statusName || '-'}</div>
</Col>
<Col span={16}>
<div><div className="title-text">事项编号</div></div>
- <div>{infoData.caseId || '-'}</div>
+ <div>{infoData?.caseRef || '-'}</div>
</Col>
{/*事项等级分为三级，颜色需要做判断*/}
<Col span={8}>
@@ -270,7 +272,7 @@
bordered={true}
style={{ marginBottom: '20px' }}
/>
- <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
+ <Col span={24} className='title'>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>登记信息</h5>
</Space>
@@ -279,21 +281,21 @@
{/*事项等级分为三级，颜色需要做判断*/}
<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>天河区棠下街道综治中心</div>
+ <div>{infoData.inputUnitName || '-'}</div>
</Col>
<Col span={8}>
<div><div className="title-text">登记人</div></div>
<div style={{ display: 'flex' }}>
- <div>李晓明</div>
+ <div>{infoData.inputUserName || '-'}</div>
<img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
</div>
</Col>
<Col span={8}>
<div ><div className="title-text">登记时间</div></div>
- <div>2024-7-8 10:00</div>
+ <div>{infoData.createTime || '-'}</div>
</Col>
</Row>
- <Button type='primary' style={{ marginTop: '20px' }}>修改</Button>
+ {props.hasEditBtn && <Button type='primary' style={{ marginTop: '20px' }}>修改</Button>}
</div>
</Typography.Paragraph>
--
Gitblit v1.8.0