From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/index.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 2978bd8..7a0e312 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,12 +2,13 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-02 19:59:41
+ * @LastEditTime: 2024-09-07 17:27:08
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
import React, { useState, useRef, Fragment, useEffect } from "react";
+import { useSearchParams, useNavigate } from 'react-router-dom';
import NewPage from '@/components/NewPage';
import * as $$ from '@/utils/utility';
import "@arco-themes/react-gzzz/css/arco.css";
@@ -33,17 +34,18 @@
}
function getDetailData(id) {
- return $$.ax.request({ url: `/casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
+ return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
}
const Organization = (props) => {
const formRef = useRef();
const routeData = useParams();
-
+ const navigate = useNavigate();
const [isReview, setIsReview] = useState(false);//预览页面控制
const [current, setCurrent] = useState(1);
const [id, setId] = useState();
+ const [partyList, setPartyList] = useState([]);//当事人信息，用于子组件回显
useEffect(() => {
if (routeData.id) {
@@ -59,14 +61,15 @@
const getDeatil = async (id) => {
const res = await getDetailData(id)
if (res.type) {
- console.log(res);
const { agentList, personList, ...rest } = res.data
+ const parList = agentList.concat(personList)
formRef.current.setFieldsValue({
...rest,
- fakeData: agentList.concat(personList),
+ fakeData: parList,
myCaseType: [rest.caseTypeFirst, rest.caseType],
myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined
})
+ setPartyList(parList)
}
}
@@ -146,7 +149,8 @@
okText: '确定受理',
cancelText: '我再想想',
onOk: async () => {
- setCurrent(3)
+ setCurrent(3);
+ navigate(`mediate/visit/handleFeedback`, { replace: true })
},
});
}
@@ -186,8 +190,8 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- <Preview style={{ display: isReview ? '' : 'none' }} />
- <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} />
+ <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} />
+ <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} partyList={partyList} />
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
--
Gitblit v1.8.0