From c41e9c7bd6fedf4e480d4737f94d13a2b9ddf5eb Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Sat, 31 Aug 2024 16:34:03 +0800 Subject: [PATCH] feat: 修改页面架构 --- gz-customerSystem/src/views/register/visit/index.jsx | 153 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 107 insertions(+), 46 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx index 65fe0de..2372777 100644 --- a/gz-customerSystem/src/views/register/visit/index.jsx +++ b/gz-customerSystem/src/views/register/visit/index.jsx @@ -2,60 +2,104 @@ * @Author: dminyi 1301963064@qq.com * @Date: 2024-08-09 09:59:43 * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-08-14 15:30:40 + * @LastEditTime: 2024-08-28 14:38:20 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx * @Description: 来访登记 */ -import React, { useState, useEffect, useRef, Fragment } from "react"; -import NewPage from '../../../components/NewPage'; -import RegisterTab from '../../../components/registerTab'; -import * as $$ from '../../../utils/utility'; -import "@arco-design/web-react/dist/css/arco.css"; +import React, { useState, useRef, Fragment } from "react"; +import NewPage from '@/components/NewPage'; +import * as $$ from '@/utils/utility'; +import "@arco-themes/react-gzzz/css/arco.css"; import '../index.less'; import { Space } from 'antd'; -import { Button } from '@arco-design/web-react'; +import { Button, Steps, Message } from '@arco-design/web-react'; import VisitorRegister from './component/visitorRegister'; import Preview from './preview'; +const Step = Steps.Step; - -function getCaseDataApi(submitData) { - return $$.ax.request({ url: `caseInfo/getCaseInfo?id=${submitData}`, type: 'get', service: 'mediate' }); +function saveDispute(data) { + return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data }); } +function getId() { + return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' }); +} + +function submitDispute(data) { + return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data }); +} const Organization = () => { const formRef = useRef(); - const [tabsActive, setTabsActive] = useState('1');// tabs当前选择的标签信息 const [isReview, setIsReview] = useState(false);//预览页面控制 - - const tabs = [ - { label: '事件登记', key: '1' }, - { label: '事件流转', key: '2' }, - { label: '办理反馈', key: '3' }, - { label: '申请结案', key: '4' }, - { label: '当事人评价', key: '5' }, - { label: '结案归档', key: '6', img1: true }, - - ]; + const [current, setCurrent] = useState(1); //提交信息,需要校验规则 const handleSubmit = async () => { if (formRef.current) { formRef.current.validate(undefined, (errors, values) => { - console.log(errors, values); + if (!errors) { + const data = formRef.current.getFields() + handleData(data).then(res => { + reauestSubmit({ + ...res, + isSelfAccept: 0, + isDraft: 0, + operateType: 0, + }) + }) + } }); } } //保存草稿信息,不需要校验规则 - const handleSave = async () => { + const handleSave = () => { if (formRef.current) { const data = formRef.current.getFields() - console.log(data); + handleData(data).then(res => { + requestSave(res) + }) + } + } + + //数据处理 + const handleData = async (data) => { + const { fakeData, ...newObj } = data + if (data.id) { + return { + ...newObj, + personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"), + agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => { + //personNameList用于查看详情显示代理人名字,不需要上传,去除 + const { personNameList, ...rest } = item + return { + ...rest, + personId: item.personId.join(',') + } + }), + } + } else { + const res = await getId() + if (res.type) { + return { + ...newObj, + personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"), + agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => { + //personNameList用于查看详情显示代理人名字,不需要上传,去除 + const { personNameList, ...rest } = item + return { + ...rest, + personId: item.personId.join(',') + } + }), + id: res.data + } + } } } @@ -67,20 +111,31 @@ function selfAcceptance() { $$.modalInfo({ title: '自行受理确认', - content: '确定自行受理本次登记事项吗?自行受理成功后事项将直接进入到本单位办理流程', + content: '确定自行受理吗?', okText: '确定受理', cancelText: '我再想想', onOk: async () => { - console.log('1111111') + setCurrent(3) }, }); - } - function submit() { - $$.info({ type: 'warning', content: '您没有预约记录,暂时无法提交' }) + //保存请求 + const requestSave = async (data) => { + const response = await saveDispute(data) + if (response.type) { + Message.success('保存草稿成功!') + } } + //提交请求 + const reauestSubmit = async (data) => { + const response = await submitDispute(data) + if (response.type) { + Message.success('提交成功!') + setCurrent(2) + } + } return ( <div style={{ position: 'relative' }}> @@ -89,24 +144,30 @@ { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' } } > - <RegisterTab tabs={tabs} activeKey={tabsActive} onChange={(activeKey) => setTabsActive(activeKey)} style={{ background: '#fff' }} /> - {tabsActive === '1' && - <Fragment> - {isReview ? <Preview /> : <VisitorRegister formRef={formRef} />} - <div className="dataSync-excel"> - <Space size="large" style={{ margin: '4px 14px' }}> - <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存信息</Button> - <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览信息</Button> - <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交信息</Button> - <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>自行受理</Button> - <Button type='secondary' onClick={handleReview}>返回上级页面</Button> - </Space> - </div> - </Fragment> - } - {/* {preview && <Preview />} */} + <Fragment> + <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}> + <Steps type='navigation' current={current}> + <Step title='来访登记' disabled /> + <Step title='事件流转' disabled /> + <Step title='办理反馈' disabled /> + <Step title='结案审核' disabled /> + <Step title='当事人评价' disabled /> + <Step title='结案归档' disabled /> + </Steps> + </div> + <Preview style={{ display: isReview ? '' : 'none' }} /> + <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} /> + <div className="dataSync-excel"> + <Space size="large" style={{ margin: '4px 14px' }}> + <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button> + <Button type='secondary' onClick={handleReview}>返回上级页面</Button> + </Space> + </div> + </Fragment> </NewPage> - </div> ) } -- Gitblit v1.8.0