From 899e81654c9389785d58f9dbdf2ea7d2b2bc9082 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Fri, 13 Sep 2024 14:55:51 +0800 Subject: [PATCH] feat: 对接流程 --- gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 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..fea76d8 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) @@ -109,10 +112,8 @@ }, []) const onWindowResize = () => { - let offsetLeft = 0; let offsetTop = 0; if (scrollRef.current.container) { - offsetLeft = getOffset(scrollRef.current.container).left; offsetTop = getOffset(scrollRef.current.container).top; } setHeight(getSize().windowH - offsetTop - 16) @@ -120,13 +121,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> @@ -148,7 +152,7 @@ autoHide > <MatterDetail caseId={props.caseId} /> - <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}> + <div className='dataSync-hasTabPage' style={{ marginTop: '-8px', paddingBottom: '64px' }}> <Tabs defaultActiveTab='1' > <TabPane key='1' @@ -185,7 +189,7 @@ unmountOnExit={true} maskClosable={false} > - <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }} /> + <BackModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setBackVisible(false) }} /> </Modal> <Modal title='上报' @@ -196,7 +200,7 @@ unmountOnExit={true} maskClosable={false} > - <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }} /> + <EscalationModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setEscalationVisible(false) }} /> </Modal> <Modal title='交办' @@ -209,15 +213,15 @@ 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' }}> + <Space size="middle" style={{ margin: '4px 14px' }}> {staticButtonList?.map(item => { 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