From cf01c0a617a2b7e50fef1efc26b359fe751e584f Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Thu, 05 Sep 2024 14:36:25 +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 | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx index 046bba9..96ba746 100644 --- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx +++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx @@ -5,6 +5,8 @@ import BackModel from "./BackModel"; import { Scrollbars } from "react-custom-scrollbars"; import { getOffset, getSize } from '@/utils/utility'; +import EscalationModel from './EscalationModel'; +import AssignedModel from './AssignedModel'; const TabPane = Tabs.TabPane; @@ -74,6 +76,8 @@ const scrollRef = useRef(null) const [backVisible, setBackVisible] = useState(false) const [height, setHeight] = useState(500) + const [escalationVisible, setEscalationVisible] = useState(false) + const [assignedVisible, setAssignedVisible] = useState(false) useEffect(() => { onWindowResize() @@ -133,8 +137,8 @@ <Button type="primary" >提交</Button> <Button type="primary" >自行受理</Button> <Button type='outline' status='danger' onClick={() => setBackVisible(true)}>回退</Button> - <Button type='outline'>交办</Button> - <Button type='outline'>上报</Button> + <Button type='outline' onClick={() => setAssignedVisible(true)}>交办</Button> + <Button type='outline' onClick={() => setEscalationVisible(true)}>上报</Button> <Button type='secondary' >返回上级页面</Button> </Space> </div> @@ -151,6 +155,30 @@ > <BackModel /> </Modal> + <Modal + title='上报' + visible={escalationVisible} + onOk={() => setEscalationVisible(false)} + onCancel={() => { setEscalationVisible(false) }} + autoFocus={false} + focusLock={true} + footer={null} + unmountOnExit={true} + maskClosable={false} + > + <EscalationModel /> + </Modal> + <Modal + title='交办' + visible={assignedVisible} + onOk={() => setAssignedVisible(false)} + onCancel={() => { setAssignedVisible(false) }} + footer={null} + unmountOnExit={true} + maskClosable={false} + > + <AssignedModel /> + </Modal> </div> ) } -- Gitblit v1.8.0