From 54cbc9b071d227212b757af65e7e4feb203b0456 Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Tue, 03 Sep 2024 11:40:50 +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 | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx index 091e29d..d5f7c12 100644 --- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx +++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx @@ -1,7 +1,8 @@ -import React from 'react'; -import { Button } from '@arco-design/web-react'; +import React, { useState } from 'react'; +import { Button, Modal } from '@arco-design/web-react'; import { Space } from 'antd'; import ProgressStep from '@/components/ProgressStep/VisitStep'; +import BackModel from "./BackModel"; const fakeData = [ { @@ -35,12 +36,22 @@ }, { handlerUserName: '白云区新市街市场监管所', - finishTime: new Date().getTime() - 11 * 60 * 60 * 1000, // 半天前的时间 + finishTime: new Date().getTime() - 10 * 60 * 60 * 1000, // 半天前的时间 handleResult: '1', status: '3', taskNodeName: '事件回退', mediResult: '22_00025-1', // handleContent: '已签收', + operationName: '赵菲菲' + }, + { + handlerUserName: '白云区新市街综治中心', + finishTime: new Date().getTime() - 9 * 60 * 60 * 1000, // 半天前的时间 + handleResult: '1', + status: '2', + taskNodeName: '回退审核', + mediResult: '22_00025-1', + handleContent: '通过', operationName: '赵菲菲' }, { @@ -56,9 +67,10 @@ ]; export default function EventFlow(props) { + const [backVisible, setBackVisible] = useState(false) const tabs = [ - { index: '1', label: '承办部门' }, - { index: '2', label: '配合部门' }, + { index: '1', label: '流转进度' }, + { index: '2', label: '督办信息' }, ]; return ( <div className='dataSync'> @@ -68,10 +80,27 @@ <div className="dataSync-excel"> <Space size="large" style={{ margin: '4px 14px' }}> <Button type="primary" >受理</Button> - <Button type='outline' status='danger'>回退</Button> + <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='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> </div> ) } -- Gitblit v1.8.0