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/views/register/matterDetail/index.jsx | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 6b957bb..3b5594e 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -7,7 +7,7 @@
import FileTable from "./FileTable";
function getCaseInfoApi(id) {
- return $$.ax.request({ url: 'caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+ return $$.ax.request({ url: '/caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
}
@@ -23,13 +23,13 @@
//获取id
const getCaseInfo = async (id) => {
- const res = await getCaseInfoApi(id)
+ const res = await getCaseInfoApi(props.caseId)
if (res.type) {
let data = res.data
const partyList = data.personList.concat(data.agentList)
setInfoData({
...data,
- questionName: data.queProvName === null ? '-' : data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName + '/' + data.queVillageName,
+ questionName: data.queProvName === null ? '-' : data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName,
caseType: data.caseTypeFirstName === null ? '-' : data.caseTypeFirstName + '/' + data.caseTypeName
})
setFakeData(partyList.map(item => {
@@ -69,7 +69,7 @@
<Col span={24} style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<Space size='small'>
- <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>当事人信息</h4>
</Space>
{props.hasApplet && <div>
<Switch checkedChildren="当事人小程序可见" unCheckedChildren="当事人小程序不可见" defaultChecked />
@@ -84,7 +84,7 @@
</div>
<Col span={24} className='title'>
<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]}>
@@ -151,38 +151,42 @@
</Col>
<Col span={16}>
<div className="title"><div className="title-text">是否重大矛盾纠纷</div></div>
- <div>{infoData.majorStatus === '0' ? '否' : infoData.majorStatus === '1' ? '是' : '-'}</div>
+ <div>{infoData.majorStatus === '1' ? '是' : '否'}</div>
</Col>
</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>
- <FileTable mainId={props.caseId} fileInfoList={infoData.fileInfoList} isReview={true}/>
- <Col span={24} className='title'>
- <Space size='small'>
- <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>登记信息</h5>
- </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>{infoData.inputUnitName || '-'}</div>
- </Col>
- <Col span={8}>
- <div><div className="title-text">登记人</div></div>
- <div style={{ display: 'flex' }}>
- <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>{infoData.createTime || '-'}</div>
- </Col>
- </Row>
+ <FileTable mainId={props.caseId} fileInfoList={infoData.fileInfoList} isReview={true} />
+ {infoData?.canal === '22_00001-1' &&
+ <>
+ <Col span={24} style={{ marginTop: '12px' }}>
+ <Space size='small'>
+ <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>{infoData.inputUnitName || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div><div className="title-text">登记人</div></div>
+ <div style={{ display: 'flex' }}>
+ <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>{infoData.createTime || '-'}</div>
+ </Col>
+ </Row>
+ </>
+ }
{/* {props.hasEditBtn && <Button type='primary' style={{ marginTop: '20px' }}>修改</Button>} */}
</div>
--
Gitblit v1.8.0