From 009868da80db32c846b32e4c406253935b4b3966 Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Wed, 11 Sep 2024 12:05:11 +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 | 98 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 80 insertions(+), 18 deletions(-) diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx index 7378401..8a94c92 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-10 20:29:15 + * @LastEditTime: 2024-09-10 23:36:06 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx * @Description: 工作台 */ @@ -820,6 +820,74 @@ }, ]; + 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) { @@ -905,7 +973,7 @@ if (type === '3') { if (tabActivekey === '4') { - setColumnType(backColumn) + setColumnType(caseResultApplyInfo) pageMyTaskBl('1') } @@ -1053,9 +1121,9 @@ rowKey="caseId" bordered={true} // style={{ marginBottom: '65px', marginTop: '-16px' }} - rowSelection={{ - type: 'Checkbox' - }} + // rowSelection={{ + // type: 'Checkbox' + // }} /> </Typography.Paragraph> </TabPane> @@ -1080,9 +1148,6 @@ rowKey="id" bordered={true} // style={{ marginBottom: '65px', marginTop: '-16px' }} - rowSelection={{ - type: 'Checkbox' - }} /> </Typography.Paragraph> </TabPane> @@ -1103,9 +1168,6 @@ rowKey="id" bordered={true} // style={{ marginBottom: '65px', marginTop: '-16px' }} - rowSelection={{ - type: 'Checkbox' - }} /> </Typography.Paragraph> </TabPane> @@ -1115,15 +1177,15 @@ </div> <div className='VisitWorkBench-bottom'> - 自行排查 - <div style={{ display: 'flex', justifyContent: 'space-evenly' }}> - <div className='bottomTab1'> - <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD', cursor: 'pointer' }}>大厅来访</div> - <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> + 群众来访接待 + <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' /> */} </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