From 7938180736be7e610ef1f27e03b2d3e1b753fe2e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 10:01:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 0f4785b..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,13 @@
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) {
@@ -35,8 +36,9 @@
const res = await accept({
caseTaskId: props.caseTaskId
})
- if(res.type) {
+ if (res.type) {
$$.infoSuccess({ content: '受理成功！' });
+ navigate('/mediate/visit/visitWorkBench')
}
},
});
@@ -76,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)
@@ -120,13 +123,16 @@
//获取流程信息
const getData = async () => {
- const res = await getListCaseFlow({
- caseId: props.caseId
- })
+ const res = await getListCaseFlow(
+ props.caseId
+ )
if (res.type) {
setProgressData(res.data)
}
}
+
+
+
return (
<Fragment>
@@ -209,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' }}>
@@ -217,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