From 5aa4a814ab8d4aa194a9683ebefaefdfc6d92c3a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 17 Sep 2024 17:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/index.jsx | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index c1c0450..31fb16e 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -225,8 +225,8 @@
},
{
title: '回退部门',
- dataIndex: 'backUnit',
- key: 'backUnit',
+ dataIndex: 'organizingUnit',
+ key: 'organizingUnit',
width: 150,
},
{
@@ -954,7 +954,7 @@
title: '督办部门',
dataIndex: 'caseGrade',
key: 'caseGrade',
- width: 80,
+ width: 110,
},
{
title: '督办意见',
@@ -1020,7 +1020,7 @@
title: '督办部门',
dataIndex: 'caseGrade',
key: 'caseGrade',
- width: 80,
+ width: 110,
},
{
title: '督办意见',
@@ -1188,6 +1188,10 @@
//改变tab
const handleColumnType = (type) => {
+ setPageData({
+ page: 1,
+ size: 10,
+ })
setSearchData({
...searchData,
status: type
@@ -1196,6 +1200,10 @@
//改变工作总览
const tabActive = (key, data) => {
+ setPageData({
+ page: 1,
+ size: 10,
+ })
//默认第一个tab
if (key == '5') {
setSearchData({
@@ -1204,11 +1212,17 @@
status: '0',
type: 1
})
- } else if (key == '4' || key == '6') {
+ } else if (key == '4') {
setSearchData({
sortType: 1,
sortColmn: 1,
status: '2',
+ })
+ } else if (key == '6') {
+ setSearchData({
+ sortType: 1,
+ sortColmn: 1,
+ status: '0',
})
} else {
setSearchData({
@@ -1219,6 +1233,7 @@
}
setTabActivekey(key);
setTableTab(data.tabList)
+ getCountData();
}
//获取工作总览数据
@@ -1347,7 +1362,7 @@
</span>
}
>
- <Typography.Paragraph key={item.value}>
+ <Typography.Paragraph key={tabActivekey + item.value}>
{tabActivekey == '5' &&
<Radio.Group
type='button'
@@ -1395,7 +1410,7 @@
setPageData({
...pageData,
page,
- pageSize
+ size: pageSize
})
},
}}
@@ -1457,7 +1472,7 @@
<div className='VisitWorkBench-bottom-title' style={{ color: '#206BCD' }}>大厅来访</div>
{/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
- <div className='bottomTab2'>
+ <div className='bottomTab2' onClick={() => navigate(`/mediate/selfInspection`)}>
<div className='VisitWorkBench-bottom-title' style={{ color: '#D46B08' }}>自行排查</div>
{/* <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
--
Gitblit v1.8.0