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/eventFlow/component/EventFlow.jsx | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 252ab71..777573e 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -10,12 +10,17 @@
import MatterDetail from '../../matterDetail';
import SupervisingView from "../../matterDetail/Supervising";
import * as $$ from '@/utils/utility';
+import { useNavigate } from 'react-router-dom';
const TabPane = Tabs.TabPane;
const Step = Steps.Step;
-function getListCaseFlow(data) {
- return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
+function getListCaseFlow(caseId) {
+ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=${caseId}`, type: 'get', service: 'mediate' });
+}
+
+function accept(data) {
+ return $$.ax.request({ url: `caseTask/accept`, type: 'post', service: 'mediate', data });
}
export default function EventFlow(props) {
@@ -23,7 +28,21 @@
{
label: '受理',
type: 'primary',
- click: () => { },
+ click: () => {
+ Modal.confirm({
+ title: '受理确认',
+ content: '确认受理该事件？',
+ onOk: async () => {
+ const res = await accept({
+ caseTaskId: props.caseTaskId
+ })
+ if (res.type) {
+ $$.infoSuccess({ content: '受理成功！' });
+ navigate('/mediate/visit/visitWorkBench')
+ }
+ },
+ });
+ },
key: 'sl',
},
{
@@ -59,6 +78,7 @@
},
]
const scrollRef = useRef(null)
+ const navigate = useNavigate();
const [backVisible, setBackVisible] = useState(false)
const [height, setHeight] = useState(500)
const [escalationVisible, setEscalationVisible] = useState(false)
@@ -103,13 +123,16 @@
//获取流程信息
const getData = async () => {
- const res = await getListCaseFlow({
- caseId: props.caseId
- })
- if(res.type) {
+ const res = await getListCaseFlow(
+ props.caseId
+ )
+ if (res.type) {
setProgressData(res.data)
}
}
+
+
+
return (
<Fragment>
@@ -130,7 +153,7 @@
ref={scrollRef}
autoHide
>
- <MatterDetail caseId={props.caseId}/>
+ <MatterDetail caseId={props.caseId} />
<div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}>
<Tabs defaultActiveTab='1' >
<TabPane
@@ -168,7 +191,7 @@
unmountOnExit={true}
maskClosable={false}
>
- <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }}/>
+ <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }} />
</Modal>
<Modal
title='上报'
@@ -179,7 +202,7 @@
unmountOnExit={true}
maskClosable={false}
>
- <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }}/>
+ <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }} />
</Modal>
<Modal
title='交办'
@@ -192,7 +215,7 @@
autoFocus={false}
focusLock={false}
>
- <AssignedModel caseId={props.caseId} onCancel={() => { setAssignedVisible(false) }}/>
+ <AssignedModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setAssignedVisible(false) }} />
</Modal>
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
@@ -200,7 +223,7 @@
const { label, key, click, ...rest } = item;
return <Button key={key} onClick={click} {...rest} >{label}</Button>
})}
- <Button type='secondary' >返回上级页面</Button>
+ <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
</div>
--
Gitblit v1.8.0