From 552853dc3cd7864d70783153a8bcf2cc8909edd2 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Mon, 02 Sep 2024 20:01:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/mediate/mediateAll/index.jsx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
index 3acd427..420096a 100644
--- a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
+++ b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: lwh
* @Date: 2022-03-29 14:11:57
- * @LastEditTime: 2024-03-11 16:12:02
+ * @LastEditTime: 2024-08-21 15:43:25
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 调解总览
@@ -159,7 +159,6 @@
tab == '2' && getMediateAllMiniData({ ...data, canal: '22_00001-2', sortType }, tableActive);
tab == '3' && getMediateAllOtherData({ ...data, canal: '22_00001-6', sortType }, tableActive);
tab == '4' && getMediatePlatformData({ ...data, canal: '22_00001-5', sortType }, tableActive);
-
return;
}
if (type === 'reset') {
@@ -393,9 +392,11 @@
const countOtherData = otherData.total || 0;
- const countPlatformData=platformData.total || 0;
+ const countPlatformData = platformData.total || 0;
const selectedRowKeys = handleGetSelectedRowKeys('selectedRowKeys');
+
+
return (
<Page pageHead={{ title: '调解总览（一本账）', subtitle: <span>汇总查看名下{<span className='ledger-main-title'>不同渠道</span>}进入多元化解平台的矛盾纠纷案件，形成白云区矛盾纠纷统一台账管理中心</span> }}>
@@ -466,13 +467,13 @@
rowKey="id"
rowSelection={mediateTab == '1' && { selectedRowKeys, onChange: onSelectChange }}
pagination={{
- current: search.page,
- pageSize: search.size,
+ current: page,
+ pageSize: size,
total: data.total,
onChange: (page, pageSize) => {
setPage(page);
setSize(pageSize);
- handleSearch('changePage', [page, pageSize, sortType], '', mediateTab)
+ handleSearch('changePage', [page, pageSize, sortType], '', mediateTab);
}
}}
rowClassName={(record) => (record.id === data.tableActive ? 'tableRowActive' : '')}
--
Gitblit v1.8.0