From 336a519d0481f9f1678e84bd47d46b66942b1ae0 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Fri, 06 Sep 2024 10:43:35 +0800 Subject: [PATCH] feat: 事件流转改变 --- gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 187 +++++++++++++++++++++++++--------------------- 1 files changed, 101 insertions(+), 86 deletions(-) diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx index 96ba746..318fd38 100644 --- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx +++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx @@ -1,5 +1,5 @@ -import React, { useState, useRef, useEffect } from 'react'; -import { Button, Modal, Tabs, Badge } from '@arco-design/web-react'; +import React, { useState, useRef, useEffect, Fragment } from 'react'; +import { Button, Modal, Tabs, Badge, Steps } from '@arco-design/web-react'; import { Space } from 'antd'; import ProgressStep from '@/components/ProgressStep/VisitStep'; import BackModel from "./BackModel"; @@ -7,8 +7,11 @@ import { getOffset, getSize } from '@/utils/utility'; import EscalationModel from './EscalationModel'; import AssignedModel from './AssignedModel'; +import MatterDetail from '../../matterDetail'; +import SupervisingView from "../../matterDetail/Supervising"; const TabPane = Tabs.TabPane; +const Step = Steps.Step; const fakeData = [ { @@ -91,94 +94,106 @@ offsetLeft = getOffset(scrollRef.current.container).left; offsetTop = getOffset(scrollRef.current.container).top; } - setHeight(getSize().windowH - offsetTop - 65) + setHeight(getSize().windowH - offsetTop - 16) }; return ( - <div className='dataSync'> - <div className='dataSync-hasTabPage' > - <Tabs defaultActiveTab='1' > - <TabPane - key='1' - title={ - <span style={{ fontSize: '15px' }}> - 流转进度 - </span> - } - > - <Scrollbars - style={{ height: height }} - ref={scrollRef} - autoHide - > - <ProgressStep progressData={fakeData} /> - </Scrollbars> - </TabPane> - <TabPane - key='2' - title={ - <span style={{ fontSize: '15px' }}> - 督办信息 - <Badge maxCount={99} count={1000} /> - </span> - } - > - <Scrollbars - style={{ height: height }} - ref={scrollRef} - ></Scrollbars> - </TabPane> - </Tabs> + <Fragment> + <div style={{ backgroundColor: '#fff', margin: '0 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}> + <Steps type='navigation' current={2}> + <Step title='来访登记' disabled /> + <Step title='事件流转' disabled /> + <Step title='办理反馈' disabled /> + <Step title='结案审核' disabled /> + <Step title='当事人评价' disabled /> + <Step title='结案归档' disabled /> + </Steps> + </div> + <div className='dataSync' style={{ marginTop: '8px' }}> + <Scrollbars + style={{ height: height }} + ref={scrollRef} + autoHide + > + <MatterDetail /> + <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}> + <Tabs defaultActiveTab='1' > + <TabPane + key='1' + title={ + <span style={{ fontSize: '15px' }}> + 流转进度 + </span> + } + > + <ProgressStep progressData={fakeData} /> + </TabPane> + <TabPane + key='2' + title={ + <span style={{ fontSize: '15px' }}> + 督办信息 + <Badge maxCount={99} count={1000} /> + </span> + } + > + <div style={{ marginBottom: '20px' }}> + <SupervisingView id={''} /> + </div> + </TabPane> + </Tabs> + </div> + </Scrollbars> + <Modal + title='回退' + visible={backVisible} + onOk={() => setBackVisible(false)} + onCancel={() => { setBackVisible(false) }} + autoFocus={false} + focusLock={true} + footer={null} + unmountOnExit={true} + maskClosable={false} + > + <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 className="dataSync-excel"> + <Space size="large" style={{ margin: '4px 14px' }}> + <Button type="primary" >受理</Button> + <Button type="primary" >提交</Button> + <Button type="primary" >自行受理</Button> + <Button type='outline' status='danger' onClick={() => setBackVisible(true)}>回退</Button> + <Button type='outline' onClick={() => setAssignedVisible(true)}>交办</Button> + <Button type='outline' onClick={() => setEscalationVisible(true)}>上报</Button> + <Button type='secondary' >返回上级页面</Button> + </Space> + </div> </div> - <div className="dataSync-excel"> - <Space size="large" style={{ margin: '4px 14px' }}> - <Button type="primary" >受理</Button> - <Button type="primary" >提交</Button> - <Button type="primary" >自行受理</Button> - <Button type='outline' status='danger' onClick={() => setBackVisible(true)}>回退</Button> - <Button type='outline' onClick={() => setAssignedVisible(true)}>交办</Button> - <Button type='outline' onClick={() => setEscalationVisible(true)}>上报</Button> - <Button type='secondary' >返回上级页面</Button> - </Space> - </div> - <Modal - title='回退' - visible={backVisible} - onOk={() => setBackVisible(false)} - onCancel={() => { setBackVisible(false) }} - autoFocus={false} - focusLock={true} - footer={null} - unmountOnExit={true} - maskClosable={false} - > - <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> + </Fragment> ) } -- Gitblit v1.8.0