From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Fri, 13 Sep 2024 19:10:30 +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 | 16 ++++------------ 1 files changed, 4 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 a6756d8..47faac2 100644 --- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx +++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx @@ -38,18 +38,12 @@ }) if (res.type) { $$.infoSuccess({ content: '受理成功!' }); - navigate('/mediate/visit/visitWorkBench') + navigate(`/mediate/visit/handleFeedback?caseTaskId=${props.caseTaskId}&caseId=${props.caseId}`) } }, }); }, key: 'sl', - }, - { - label: '提交', - type: 'primary', - click: () => { }, - key: 'tj', }, { label: '自行受理', @@ -112,10 +106,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) @@ -171,7 +163,7 @@ title={ <span style={{ fontSize: '15px' }}> 督办信息 - <Badge maxCount={99} count={1000} /> + {/* <Badge maxCount={99} count={1000} /> */} </span> } > @@ -191,7 +183,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='上报' @@ -202,7 +194,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='交办' -- Gitblit v1.8.0