From c25bde50c087f7814d88533b46772f94c3373c82 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 11 Sep 2024 11:09:05 +0800
Subject: [PATCH] 修改
---
gz-customerSystem/src/views/register/index.jsx | 253 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 213 insertions(+), 40 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 26359b2..8c00c5b 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-08 15:14:12
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-09 22:29:34
+ * @LastEditTime: 2024-09-10 23:36:06
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -14,11 +14,12 @@
import { Tabs, Typography, Radio } from '@arco-design/web-react';
import * as $$ from '@/utils/utility';
+
const TabPane = Tabs.TabPane;
-function pageMyTaskBlApi(data) {
- return $$.ax.request({ url: `caseTask/pageMyTaskBl`, type: 'get', service: 'mediate', data });
-}
+// function pageMyTaskBlApi(data) {
+// return $$.ax.request({ url: `caseTask/pageMyTaskBl`, type: 'get', service: 'mediate', data });
+// }
function getCountListApi(data) {
return $$.ax.request({ url: `caseTask/getCountList`, type: 'get', service: 'mediate', data });
@@ -41,6 +42,17 @@
//办理中
function pageMyTaskBlzApi(data) {
return $$.ax.request({ url: `caseTask/pageMyTaskBlz?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//待审核
+function pageMyTaskShApi(type) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskSh?page=1&size=10&sortType=1&status=0&type=` + type, type: 'get', service: 'mediate' });
+}
+
+
+//待审核
+function pageMyTaskBlApi(type) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskBl?page=1&size=10&sortType=1&sortColmn=1&status=` + type, type: 'get', service: 'mediate' });
}
//签收
@@ -81,7 +93,7 @@
key: '4',
label: '办理中',
bgColor: '#E6FFFB',
- num: `${CountList?.waitReview || '0'}`,
+ num: `${CountList?.processing || '0'}`,
img: tab4
},
@@ -89,7 +101,7 @@
key: '5',
label: '待审核',
bgColor: '#E8F7FF',
- num: `${CountList?.supervise || '0'}`,
+ num: `${CountList?.waitReview || '0'}`,
img: tab5
},
@@ -97,7 +109,7 @@
key: '6',
label: '督办',
bgColor: '#FFF7E6',
- num: `${CountList?.processing || '0'}`,
+ num: `${CountList?.supervise || '0'}`,
img: tab6
},
@@ -383,7 +395,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -428,8 +439,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
@@ -440,7 +451,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -485,7 +495,7 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
</Space>
),
},
@@ -496,7 +506,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -541,8 +550,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => handleSign(record.caseId, record.ownerId)}>签收</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => handleSign(record.caseId, record.ownerId)} style={{ cursor: 'pointer' }}>签收</div>
</Space>
),
},
@@ -553,7 +562,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -598,7 +606,7 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div>签收</div>
</Space>
),
@@ -654,7 +662,7 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
@@ -710,7 +718,7 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
@@ -785,7 +793,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>处理</div>
</Space>
),
@@ -848,7 +856,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
{/* <div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div> */}
{(direction === '回退审核' || direction === '上报审核') &&
<div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
@@ -868,7 +876,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '回复时限',
@@ -932,10 +939,150 @@
},
])
+ //结案申请
+ const caseResultApply = [
+ {
+ title: '结案申请时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 180,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 180,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 180,
+ },
+ {
+ title: '承办部门',
+ dataIndex: 'organizingUnit',
+ key: 'organizingUnit',
+ width: 180,
+ },
+ {
+ title: '配合部门',
+ dataIndex: 'cooperatingUnit',
+ key: 'cooperatingUnit',
+ width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '化解结果',
+ dataIndex: 'mediResult',
+ key: 'mediResult',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ render: (text, record) => (
+ <Space style={{ color: '#1A6FB8' }}>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}&windupId=${record.windupId}`)} style={{ cursor: 'pointer' }}>处理</div>
+ </Space>
+ ),
+ },
+ ];
+
+ const caseResultApplyInfo = [
+ {
+ title: '结案申请时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 180,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 180,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 180,
+ },
+ {
+ title: '承办部门',
+ dataIndex: 'organizingUnit',
+ key: 'organizingUnit',
+ width: 180,
+ },
+ {
+ title: '配合部门',
+ dataIndex: 'cooperatingUnit',
+ key: 'cooperatingUnit',
+ width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '化解结果',
+ dataIndex: 'mediResult',
+ key: 'mediResult',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ render: (text, record) => (
+ <Space style={{ color: '#1A6FB8' }}>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ </Space>
+ ),
+ },
+ ];
+
const sign = async (caseId, ownerId) => {
const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
if (res.type) {
- $$.infoSuccess('签收成功')
+ $$.infoSuccess({ content: '签收成功' });
+ getCountList();
+ pageMyTaskFpNew()
}
}
@@ -976,7 +1123,17 @@
setFakeData1(res.data?.content)
}
}
+ if (type === '5') {
+ }
+ }
+ const handleSh = async (e) => {
+ console.log(direction, 'direction')
+ const res = await pageMyTaskShApi(e === '回退审核' ? 1 : e === '上报审核' ? 2 : e === '结案申请审核' ? 3 : e === '联合处置审核' ? 4 : null)
+ if (res.type) {
+ setColumnType(caseResultApply)
+ setFakeData1(res.data?.content)
+ }
}
const handleColumnType = (type) => {
@@ -991,10 +1148,22 @@
if (tabActivekey === '3') {
setColumnType(fakeColumns2Info)
}
+ if (tabActivekey === '4') {
+ setColumnType(caseResultApply)
+ pageMyTaskBl('0')
+ }
}
if (type === '1') {
if (tabActivekey === '1') {
setColumnType(fakeColumns3)
+ }
+ }
+
+ if (type === '3') {
+ if (tabActivekey === '4') {
+ setColumnType(caseResultApplyInfo)
+ pageMyTaskBl('1')
+
}
}
@@ -1036,11 +1205,10 @@
}
}
- const pageMyTaskBl = async () => {
- const res = await pageMyTaskBlApi({ page: 1, size: 10, timeStart: '', timeEnd: '', partyName: '', sortType: '', sortColmn: '' })
+ const pageMyTaskBl = async (type) => {
+ const res = await pageMyTaskBlApi(type)
if (res.type) {
- console.log(res.data, 'res.data')
- // setColumn(res.data)
+ setFakeData1(res.data?.content)
}
}
@@ -1111,7 +1279,7 @@
type='button'
name='direction'
value={direction}
- onChange={(e) => setDirection(e)}
+ onChange={(e) => { setDirection(e); handleSh(e) }}
style={{ marginBottom: 16 }}
options={['回退审核', '上报审核', '结案申请审核', '联合处置审核']}
></Radio.Group>
@@ -1123,9 +1291,9 @@
rowKey="caseId"
bordered={true}
// style={{ marginBottom: '65px', marginTop: '-16px' }}
- rowSelection={{
- type: 'Checkbox'
- }}
+ // rowSelection={{
+ // type: 'Checkbox'
+ // }}
/>
</Typography.Paragraph>
</TabPane>
@@ -1150,9 +1318,6 @@
rowKey="id"
bordered={true}
// style={{ marginBottom: '65px', marginTop: '-16px' }}
- rowSelection={{
- type: 'Checkbox'
- }}
/>
</Typography.Paragraph>
</TabPane>
@@ -1166,6 +1331,14 @@
}
>
<Typography.Paragraph>
+ <TableView
+ columns={columnType}
+ dataSource={fakeData1}
+ size="small"
+ rowKey="id"
+ bordered={true}
+ // style={{ marginBottom: '65px', marginTop: '-16px' }}
+ />
</Typography.Paragraph>
</TabPane>
}
@@ -1174,15 +1347,15 @@
</div>
<div className='VisitWorkBench-bottom'>
- 自行排查
- <div style={{ display: 'flex', justifyContent: 'space-evenly' }}>
- <div className='bottomTab1'>
+ 群众来访接待
+ <div style={{ display: 'flex', justifyContent: 'space-evenly',gap:'24px',marginTop:'16px' }}>
+ <div className='bottomTab1' style={{ cursor: 'pointer' }}>
<div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD' }}>大厅来访</div>
- <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' />
+ {/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
- <div className='bottomTab2'>
+ <div className='bottomTab2' style={{ cursor: 'pointer' }}>
<div className='VisitWorkBench-bottom-title' style={{ color: '#D46B08' }}>自行排查</div>
- <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' />
+ {/* <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
</div>
</div>
--
Gitblit v1.8.0