From 552853dc3cd7864d70783153a8bcf2cc8909edd2 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Mon, 02 Sep 2024 20:01:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/visit/index.jsx | 104 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 37 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index bf03f00..60a8177 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,20 +2,21 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-02 11:40:22
+ * @LastEditTime: 2024-09-02 19:59:41
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
-import React, { useState, useRef, Fragment } from "react";
+import React, { useState, useRef, Fragment, useEffect } 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, Steps, Tabs, Message } from '@arco-design/web-react';
+import { Button, Steps, Message } from '@arco-design/web-react';
import VisitorRegister from './component/visitorRegister';
import Preview from './preview';
+import { useParams } from 'react-router-dom';
const Step = Steps.Step;
@@ -31,26 +32,63 @@
return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
}
+function getDetailData(id) {
+ return $$.ax.request({ url: `/casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
+}
-const Organization = () => {
+
+const Organization = (props) => {
const formRef = useRef();
+ const routeData = useParams();
const [isReview, setIsReview] = useState(false);//预览页面控制
- const [current, setCurrent] = useState(3);
+ const [current, setCurrent] = useState(1);
+ const [id, setId] = useState();
+
+ useEffect(() => {
+ if (routeData.id) {
+ getDeatil(routeData.id)
+ } else {
+ getAppId()
+ }
+
+ }, [])
+
+ //编辑
+ const getDeatil = async (id) => {
+ const res = await getDetailData(id)
+ if (res.type) {
+ console.log(res);
+ const { agentList, personList, ...rest } = res.data
+ formRef.current.setFieldsValue({
+ ...rest,
+ fakeData: agentList.concat(personList),
+ myCaseType: [rest.caseTypeFirst, rest.caseType],
+ myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined
+ })
+ }
+ }
+
+ //获取id
+ const getAppId = async () => {
+ const res = await getId()
+ if (res.type) {
+ setId(res.data)
+ }
+ }
//提交信息，需要校验规则
const handleSubmit = async () => {
if (formRef.current) {
formRef.current.validate(undefined, (errors, values) => {
if (!errors) {
- const data = formRef.current.getFields()
- handleData(data).then(res => {
- reauestSubmit({
- ...res,
- isSelfAccept: 0,
- isDraft: 0,
- operateType: 0,
- })
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
})
}
});
@@ -60,45 +98,37 @@
//保存草稿信息,不需要校验规则
const handleSave = () => {
if (formRef.current) {
- const data = formRef.current.getFields()
- handleData(data).then(res => {
- requestSave(res)
- })
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ requestSave(params)
}
}
//数据处理
- const handleData = async (data) => {
+ const handleData = (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,
+ ...item,
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
- }
+ 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 => {
+ return {
+ ...item,
+ personId: item.personId.join(',')
+ }
+ }),
+ id: id
}
}
}
@@ -156,7 +186,7 @@
</Steps>
</div>
<Preview style={{ display: isReview ? '' : 'none' }} />
- <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} />
+ <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} />
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
--
Gitblit v1.8.0