From 5aa4a814ab8d4aa194a9683ebefaefdfc6d92c3a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 17 Sep 2024 17:18:05 +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 | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index d76dd19..c87f76f 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -10,6 +10,7 @@
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;
@@ -37,17 +38,12 @@
})
if (res.type) {
$$.infoSuccess({ content: '受理成功！' });
+ navigate(`/mediate/visit/handleFeedback?caseTaskId=${res.data}&caseId=${props.caseId}`)
}
},
});
},
key: 'sl',
- },
- {
- label: '提交',
- type: 'primary',
- click: () => { },
- key: 'tj',
},
{
label: '自行受理',
@@ -76,6 +72,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 +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)
@@ -151,7 +146,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'
@@ -168,7 +163,7 @@
title={
<span style={{ fontSize: '15px' }}>
督办信息
- <Badge maxCount={99} count={1000} />
+ {/* <Badge maxCount={99} count={1000} /> */}
</span>
}
>
@@ -188,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='上报'
@@ -199,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='交办'
@@ -212,15 +207,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