From 8617a79951c9c45d60ffdf84d1627062408c131c Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 12:43:33 +0800
Subject: [PATCH] feat: 办理结果无数据不显示、流转督办可滚动
---
gz-customerSystem/src/views/register/index.less | 2 +-
gz-customerSystem/src/views/register/visit/preview.jsx | 4 ++--
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 2 +-
gz-customerSystem/src/api/appUrl.js | 4 ++--
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 20 ++++++++++++++------
gz-customerSystem/src/views/register/index.jsx | 16 ++++++----------
6 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 716b3ee..e776580 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -10,11 +10,11 @@
export const debug = {
// web服务
// baseUrl: 'http://gz.hugeinfo.com.cn',
- baseUrl: "http://192.168.3.108:9002",
+ baseUrl: "http://zdpn35.natappfree.cc",
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- fileUrl: "http://192.168.3.108:9002",
+ fileUrl: "http://zdpn35.natappfree.cc",
// fileUrl: 'http://gz.hugeinfo.com.cn',
// 文件查看url 后面接附件编号
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 777573e..2e7bc9f 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -154,7 +154,7 @@
autoHide
>
<MatterDetail caseId={props.caseId} />
- <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}>
+ <div className='dataSync-hasTabPage' style={{ marginTop: '-8px', paddingBottom: '64px' }}>
<Tabs defaultActiveTab='1' >
<TabPane
key='1'
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 8a94c92..e60ca7b 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -115,9 +115,7 @@
},
]
-
const [fakeData1, setFakeData1] = useState([])
-
const [columnType, setColumnType] = useState([
{
title: '流转时间',
@@ -532,8 +530,7 @@
),
},
];
-
- const [column, setColumn] = useState([
+ const column = [
{
title: '流转时间',
dataIndex: 'turnaroundTime',
@@ -606,9 +603,8 @@
</Space>
),
},
- ])
-
- const [backColumn, setBackColumn] = useState([
+ ]
+ const backColumn = [
{
title: '回退时间',
dataIndex: 'turnaroundTime',
@@ -676,9 +672,9 @@
</Space>
),
},
- ])
+ ]
- const [mangeColumn, setMangeColumn] = useState([
+ const mangeColumn = [
{
title: '督办时间',
dataIndex: 'turnaroundTime',
@@ -748,7 +744,7 @@
</Space>
),
},
- ])
+ ]
//结案申请
const caseResultApply = [
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 4fd2dc5..4449867 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -147,7 +147,7 @@
&-hasTabPage {
background-color: #fff;
margin: 8px 16px 0px 16px;
- padding: 12px 16px 64px 16px;
+ padding: 12px 16px 16px 16px;
.arco-tabs-header-nav {
margin-left: 0 !important;
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 88c6b7d..33e6d42 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,
@@ -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, fileName: res.data.fileInfoBaseDTOList?.map(item => item.trueName) })
+ } else {
+ setTransactResult(null)
+ }
+
}
}
@@ -179,7 +185,7 @@
<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,7 +202,9 @@
</span>
}
>
- <ProgressStep progressData={progressData} hasTab={true} />
+ <Scrollbars style={{ height: 'calc(100vh - 300px)' }} autoHide>
+ <ProgressStep progressData={progressData} hasTab={true} />
+ </Scrollbars>
</TabPane>
<TabPane
key='2'
@@ -207,9 +215,9 @@
</span>
}
>
- <div style={{ marginBottom: '20px' }}>
+ <Scrollbars style={{ height: 'calc(100vh - 300px)' }} autoHide>
<SupervisingView id={''} />
- </div>
+ </Scrollbars>
</TabPane>
</Tabs>
</div>
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index a7c160a..e5ba619 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -201,9 +201,9 @@
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">受理时间</th>
- <td width='380'>2024-7-1 10:00</td>
+ <td width='380'>{props.transactResult?.acceptTime || '-'}</td>
<th bgcolor="#F7F8FA" className="table-title" width="120">办结时间</th>
- <td width='380'>{props.transactResult?.fileTime || '-'}</td>
+ <td width='380'>{props.transactResult?.closeTime || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
--
Gitblit v1.8.0