From e92ddbcdc1cb990de02621bccfa62cc067afd3b9 Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Mon, 09 Sep 2024 15:26:24 +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 | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx index c32fc7c..74a56cc 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-04 10:20:40 + * @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 [editData, setEditData] = useState({});//回显数据 useEffect(() => { if (routeData.id) { @@ -59,14 +61,16 @@ const getDeatil = async (id) => { const res = await getDetailData(id) if (res.type) { - console.log(res); const { agentList, personList, ...rest } = res.data - formRef.current.setFieldsValue({ + const parList = agentList.concat(personList) + const obj = { ...rest, - fakeData: agentList.concat(personList), + fakeData: parList, myCaseType: [rest.caseTypeFirst, rest.caseType], myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined - }) + } + formRef.current.setFieldsValue(obj) + setEditData(obj) } } @@ -146,7 +150,8 @@ okText: '确定受理', cancelText: '我再想想', onOk: async () => { - setCurrent(3) + setCurrent(3); + navigate(`mediate/visit/handleFeedback`, { replace: true }) }, }); } @@ -187,7 +192,13 @@ </Steps> </div> <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} /> - <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} /> + <VisitorRegister + formRef={formRef} + style={{ display: isReview ? 'none' : '' }} + mainId={id} + partyList={editData.fakeData} + fileInfoList={editData.fileInfoList} + /> <div className="dataSync-excel"> <Space size="large" style={{ margin: '4px 14px' }}> <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button> -- Gitblit v1.8.0