From a7cba2f05df12ab546ef1c20b63aad10ec0e7a5c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Fri, 30 Aug 2024 16:45:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/visit/index.jsx | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 5c7ace5..8a3be63 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -13,8 +13,8 @@
import "@arco-themes/react-gzzz/css/arco.css";
import '../index.less';
import { Space } from 'antd';
-import { Button, Steps, Tabs } from '@arco-design/web-react';
-import VisitorRegister from './component/VisitorRegister';
+import { Button, Steps, Tabs, Message } from '@arco-design/web-react';
+import VisitorRegister from './component/visitorRegister';
import Preview from './preview';
import MattersInfo from './component/MattersInfo';
import { question, register, Matter, transfer } from '@/assets/images'
@@ -22,15 +22,24 @@
const Step = Steps.Step;
const TabPane = Tabs.TabPane;
-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 [isReview, setIsReview] = useState(false);//预览页面控制
- const [current, setCurrent] = useState(1);
+ const [current, setCurrent] = useState(2);
const [tabsActive, setTabsActive] = useState('1');
const [tabsList, setTabList] = useState([
{
@@ -45,23 +54,74 @@
isNeedStep: true,//加上这个就有进度条
},
])
-
+ const breadcrumbDataMap = {
+ 1: { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' },
+ 2: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' },
+ 3: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
+ }
//提交信息，需要校验规则
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);
- setCurrent(2)
+ 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
+ }
+ }
}
}
@@ -82,9 +142,21 @@
});
}
- const breadcrumbDataMap = {
- 1: { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' },
- 3: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
+ //保存请求
+ 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 (
@@ -107,7 +179,8 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- {isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
+ <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>
@@ -120,7 +193,7 @@
</Fragment>
}
{
- (current === 3 || current === 2) &&
+ (current === 2 || current === 3) &&
<Tabs defaultActiveTab='1' onChange={(v) => setTabsActive(v)}>
{tabsList?.map(item => {
return <TabPane
@@ -144,7 +217,7 @@
</Steps>
</div>
}
- <MattersInfo active={tabsActive} current={current} />
+ <MattersInfo active={tabsActive} current={current}/>
</TabPane>
})}
</Tabs>
--
Gitblit v1.8.0