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/comprehensive/index.jsx | 114 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 45 deletions(-)
diff --git a/gz-customerSystem/src/views/comprehensive/index.jsx b/gz-customerSystem/src/views/comprehensive/index.jsx
index 1812110..dd193a3 100644
--- a/gz-customerSystem/src/views/comprehensive/index.jsx
+++ b/gz-customerSystem/src/views/comprehensive/index.jsx
@@ -1,11 +1,11 @@
import React, { useEffect, useState } from 'react';
-import Page from '../../components/Page/index';
+import NewPage from '../../components/NewPage/index';
import { Form, Typography, Space, Tooltip } from 'antd';
import { FolderFilled } from '@ant-design/icons';
import * as $$ from '../../utils/utility';
import { useLocation, useNavigate } from 'react-router-dom';
-import TableView from '../../components/TableView';
+import TableView from '../../components/TableViewCanSort';
import NewTableSearch from '../../components/NewTableSearch';
import MyTabs from '../../components/MyTabs';
import './index.less'
@@ -42,11 +42,11 @@
// 表头
const columns = () => {
const columnsData = [
- { title: '事项状态', width: 80, dataIndex: 'statusName' },
- { title: '事项来源', width: 80, dataIndex: 'canalName' },
- { title: '事项等级', width: 80, dataIndex: 'caseLevel' },
+ { title: '事项状态', width: 100, dataIndex: 'statusName' },
+ { title: '事项来源', width: 100, dataIndex: 'canalName' },
+ { title: '事项等级', width: 100, dataIndex: 'caseLevel' },
{ title: '纠纷类型', width: 150, dataIndex: 'caseTypeName' },
- { title: '承办部门', width: 150, dataIndex: 'mediateDeptName' },
+ { title: '承办部门', width: 150, dataIndex: 'mediateUnitName' },
{ title: '配合部门', width: 150, dataIndex: 'assistUnitName' },
// 22_00025-1 成功 22_00025-2 化解不成功
{ title: '化解结果', width: 100, dataIndex: 'mediResult', render: (text) => <div className={text === '22_00025-1' ? 'comprehensive-green' : text === '22_00025-2' ? 'comprehensive-red' : '-'} >{text === '22_00025-1' ? '化解成功' : text === '22_00025-2' ? '化解不成功' : '-'}</div> },
@@ -171,8 +171,8 @@
if (res.type) {
setSearch(submitData);
setData({
- total: res.data?.totalElements,
- tableData: res.data?.content || [],
+ total: 0,
+ tableData: [],
});
}
}
@@ -191,8 +191,12 @@
return (
- <Page pageHead={{ title: '综合查询', subtitle: '管理员名下综合查询列表' }}>
- <div className="mediateList">
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '综合查询' }], title: '综合查询' }
+ }
+ >
+ <div className="comprehensive">
<div className="pageSearch">
<div className='comprehensive-title'>查询条件</div>
<NewTableSearch
@@ -201,7 +205,11 @@
form={form}
itemData={[
{ type: 'RangePicker', name: 'acceptTime', label: '办结时间', span: 8 },
+ { type: 'null'},
+ { type: 'null'},
{ type: 'RangePicker', name: 'acceptTime', label: '归档时间', span: 8 },
+ { type: 'null'},
+ { type: 'null'},
{
type: 'Select',
name: 'joinRole',
@@ -212,49 +220,65 @@
{ label: '我协助的', value: '2' },
],
},
- {
- type: 'Select',
- name: 'joinRole',
- label: '承办部门',
- selectdata: [
- { label: '我负责的', value: '1' },
- { label: '我协助的', value: '2' },
- ],
- },
- {
- type: 'Select',
- name: 'joinRole',
- label: '登记机构',
- selectdata: [
- { label: '我负责的', value: '1' },
- { label: '我协助的', value: '2' },
- ],
- },
- { type: 'Input', name: 'defendants', label: '被申请人' },
- { type: 'Input', name: 'caseNo', label: '调解案号' },
+ // {
+ // type: 'Select',
+ // name: 'joinRole',
+ // label: '承办部门',
+ // selectdata: [
+ // { label: '我负责的', value: '1' },
+ // { label: '我协助的', value: '2' },
+ // ],
+ // },
+ // {
+ // type: 'Select',
+ // name: 'joinRole',
+ // label: '登记机构',
+ // selectdata: [
+ // { label: '我负责的', value: '1' },
+ // { label: '我协助的', value: '2' },
+ // ],
+ // },
+ // { type: 'Input', name: 'defendants', label: '被申请人' },
+ // { type: 'Input', name: 'caseNo', label: '调解案号' },
]}
handleReset={() => handleSearch('reset')}
handleSearch={() => handleSearch('search')}
/>
</div>
- <div style={{ marginTop: '8px' }} className="pageTable">
- <TableView
- showHeader
- title="查询结果"
- columns={columns()}
- dataSource={data.tableData}
- pagination={{
- current: search.page,
- pageSize: search.size,
- total: data.total,
- onChange: (page, pageSize) => handleChangePage(page, pageSize),
- }}
- rowClassName={(record) => (record.id === data.tableActive ? 'tableRowActive' : '')}
- />
+ <div style={{ marginTop: '8px' }} className="comprehensive-table">
+ {
+ data.tableData?.length > 0 ?
+ <TableView
+ showHeader
+ title="查询结果"
+ columns={columns()}
+ dataSource={data.tableData}
+ pagination={{
+ current: search.page,
+ pageSize: search.size,
+ total: data.total,
+ onChange: (page, pageSize) => handleChangePage(page, pageSize),
+ }}
+ rowClassName={(record) => (record.id === data.tableActive ? 'tableRowActive' : '')}
+ /> :
+ <TableView
+ showHeader
+ title="查询结果"
+ columns={columns()}
+ dataSource={data.tableData}
+ pagination={{
+ current: search.page,
+ pageSize: search.size,
+ total: data.total,
+ onChange: (page, pageSize) => handleChangePage(page, pageSize),
+ }}
+ rowClassName={(record) => (record.id === data.tableActive ? 'tableRowActive' : '')}
+ />
+ }
</div>
</div>
- </Page>
+ </NewPage>
);
};
--
Gitblit v1.8.0