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/fileMessage.jsx | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 88c6b7d..8bd6bd8 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -46,7 +46,7 @@
const [current, setCurrent] = useState(7);
const [grade, setGrade] = useState(null);
const [caseInfo, setCaseInfo] = useState({})
- const [TransactResult, setTransactResult] = useState({})
+ const [TransactResult, setTransactResult] = useState(null)
const [tabsList, setTabList] = useState([
{
img: result,
@@ -59,11 +59,11 @@
label: '流转督办',
key: '2',
},
- {
- img: apply,
- label: '申请记录',
- key: '3',
- },
+ // {
+ // img: apply,
+ // label: '申请记录',
+ // key: '3',
+ // },
])
const [list, setList] = useState([])
const [progressData, setProgressData] = useState({});
@@ -79,8 +79,14 @@
const getTransactResult = async (id) => {
const res = await getTransactResultApi(id)
+ console.log(res);
if (res.type) {
- setTransactResult({ ...res.data, fileName: res.data.fileInfoBaseDTOList.map(item => item.trueName) })
+ if (res.data) {
+ setTransactResult({ ...res.data })
+ } else {
+ setTransactResult(null)
+ }
+
}
}
@@ -164,7 +170,7 @@
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>办理记录（{list.length}）</h4>
</Space>
- <HandleRecord isReview={true} data={list} />
+ <HandleRecord isReview={true} data={list} noEdit/>
</div>
}
{grade &&
@@ -172,14 +178,17 @@
<RateModule grade={grade} />
</div>
}
- <div style={{ backgroundColor: '#ffff', margin: '8px 16px 65px 16px', padding: '12px' }}>
- <RegisInfoModule caseInfo={caseInfo} />
- </div>
+ {caseInfo?.canal === '22_00001-1' &&
+ <div style={{ backgroundColor: '#ffff', margin: '8px 16px 0px 16px', padding: '12px' }}>
+ <RegisInfoModule caseInfo={caseInfo} />
+ </div>
+ }
+ <div style={{ backgroundColor: '#ffff', margin: '0 16px 64px 16px', padding: '12px' }}></div>
</Scrollbars>
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type='primary' >导出</Button>
- <Button type='secondary'onClick={() => navigate(-1)}>返回上级页面</Button>
+ <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
</>
@@ -196,20 +205,22 @@
</span>
}
>
- <ProgressStep progressData={progressData} hasTab={true} />
+ <Scrollbars style={{ height: 'calc(100vh - 300px)' }} autoHide>
+ <ProgressStep progressData={progressData} hasTab={true} />
+ </Scrollbars>
</TabPane>
<TabPane
key='2'
title={
<span style={{ fontSize: '15px' }}>
督办信息
- <Badge maxCount={99} count={1000} />
+ {/* <Badge maxCount={99} count={1000} /> */}
</span>
}
>
- <div style={{ marginBottom: '20px' }}>
+ <Scrollbars style={{ height: 'calc(100vh - 300px)' }} autoHide>
<SupervisingView id={''} />
- </div>
+ </Scrollbars>
</TabPane>
</Tabs>
</div>
--
Gitblit v1.8.0