From 52aa9f64e5dea1c0e30bc1094fa580c3851d8f9d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 14 Sep 2024 18:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/comprehensive/index.jsx | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/gz-customerSystem/src/views/comprehensive/index.jsx b/gz-customerSystem/src/views/comprehensive/index.jsx
index a02d444..f06c4a7 100644
--- a/gz-customerSystem/src/views/comprehensive/index.jsx
+++ b/gz-customerSystem/src/views/comprehensive/index.jsx
@@ -1,6 +1,6 @@
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';
@@ -48,10 +48,11 @@
{ title: '纠纷类型', width: 150, dataIndex: 'caseTypeName' },
{ title: '承办部门', width: 150, dataIndex: 'mediateDeptName' },
{ title: '配合部门', width: 150, dataIndex: 'assistUnitName' },
- { title: '化解结果', width: 80, dataIndex: 'mediResult' },
- { title: '办结时间', width: 80, dataIndex: 'closeTime' },
- // { title: '申请方', dataIndex: 'plaintiffList' },
- // { title: '被申请方', dataIndex: 'defendantList' },
+ // 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> },
+ { title: '办结时间', width: 100, dataIndex: 'closeTime', render: (text) => <span>{$$.dateFormat(text)}</span> },
+ { title: '申请方', dataIndex: 'action', render: (text, record) => <div>{record.plaintiffList?.length > 0 ? record.plaintiffList?.map(i => i.trueName)?.join(',') : '-'}</div> },
+ { title: '被申请方', dataIndex: 'action', render: (text, record) => <div>{record.defendantList?.length > 0 ? record.defendantList?.map(i => i.trueName)?.join(',') : '-'}</div> },
{ title: '登记机构', dataIndex: 'inputUnitName' },
{
title: '操作',
@@ -125,6 +126,12 @@
getCaseInfoData(paramsObj);
}
+
+ // 导出数据
+ function downloadXls() {
+ window.open(`${$$.appUrl.baseUrl}/dyh-mediate/api/web/caseInfo/exportQueryAll`);
+ };
+
// 搜索 or 重置
function handleSearch(type, session) {
let paramsObj = {};
@@ -184,11 +191,16 @@
return (
- <Page pageHead={{ title: '综合查询', subtitle: '管理员名下综合查询列表' }}>
- <div className="myMediation">
- <div className="myMediation-search">
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '综合查询' }], title: '综合查询' }
+ }
+ >
+ <div className="comprehensive">
+ <div className="pageSearch">
<div className='comprehensive-title'>查询条件</div>
<NewTableSearch
+ exportButton={downloadXls}
labelLength={6}
form={form}
itemData={[
@@ -246,7 +258,7 @@
/>
</div>
</div>
- </Page>
+ </NewPage>
);
};
--
Gitblit v1.8.0