From 68f41dad70cc9c90b87258d91300576d7f5682e7 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Sat, 14 Sep 2024 15:58:38 +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 | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index eb6690f..8f5a353 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -1,8 +1,8 @@
/*
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-08 15:14:12
- * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-12 15:42:34
+ * @LastEditors: lwh
+ * @LastEditTime: 2024-09-13 10:35:03
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -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: '督办意见',
@@ -1204,11 +1204,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,13 +1225,14 @@
}
setTabActivekey(key);
setTableTab(data.tabList)
+ getCountData();
}
//获取工作总览数据
const getCountData = async () => {
const res = await getCountListApi()
if (res.type) {
- const data = res.data
+ const data = res.data || {};
setCountData(data)
}
}
@@ -1347,7 +1354,7 @@
</span>
}
>
- <Typography.Paragraph key={item.value}>
+ <Typography.Paragraph key={tabActivekey + item.value}>
{tabActivekey == '5' &&
<Radio.Group
type='button'
--
Gitblit v1.8.0