From 42ad61a075d8a3c32949d83bf40acc53b2da25b1 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Fri, 13 Sep 2024 20:53:35 +0800 Subject: [PATCH] fix: 修改预览的文件回显bug --- gz-customerSystem/src/views/register/visit/index.jsx | 91 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 71 insertions(+), 20 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx index 60a8177..0002a87 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-12 14:39:18 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx * @Description: 来访登记 */ import React, { useState, useRef, Fragment, useEffect } from "react"; +import { useParams, useNavigate } from 'react-router-dom'; import NewPage from '@/components/NewPage'; import * as $$ from '@/utils/utility'; import "@arco-themes/react-gzzz/css/arco.css"; @@ -16,7 +17,6 @@ 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; @@ -33,21 +33,23 @@ } 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) { getDeatil(routeData.id) + setId(routeData.id) } else { getAppId() } @@ -58,14 +60,46 @@ 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 newParList = parList?.map(item => { + const fileInfoList = item.fileInfoList + let file = [];//身份证明材料、企业登记材料 + let file1 = [];//法人、机构身份证明材料、代理人授权委托书 + if (fileInfoList && fileInfoList.length != 0) { + fileInfoList.forEach(item => { + if (item.ownerType == '22_00018-202' || item.ownerType == '22_00018-203') { + item.fileList.forEach(res => { + file.push({ + ...res, + uid: res.id, + }) + }) + } + if (item.ownerType == '22_00018-204' || item.ownerType == '22_00018-207') { + item.fileList.forEach(res => { + file1.push({ + ...res, + uid: res.id, + }) + }) + } + }) + } + return { + ...item, + file, + file1 + } + }) || [] + const obj = { ...rest, - fakeData: agentList.concat(personList), + fakeData: newParList, myCaseType: [rest.caseTypeFirst, rest.caseType], myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined - }) + } + formRef.current.setFieldsValue(obj) + setEditData(obj) } } @@ -84,12 +118,19 @@ if (!errors) { const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields() const params = handleData(rest) - reauestSubmit({ - ...params, - isSelfAccept: 0, - isDraft: 0, - operateType: 0, - }) + $$.modalInfo({ + title: '提醒', + content: '确定提交吗?', + cancelText: '我再想想', + onOk: () => { + reauestSubmit({ + ...params, + isSelfAccept: 0, + isDraft: 0, + operateType: 0, + }) + }, + }); } }); } @@ -145,7 +186,8 @@ okText: '确定受理', cancelText: '我再想想', onOk: async () => { - setCurrent(3) + setCurrent(3); + navigate(`mediate/visit/handleFeedback`, { replace: true }) }, }); } @@ -163,6 +205,7 @@ const response = await submitDispute(data) if (response.type) { Message.success('提交成功!') + navigate(`/mediate/visit/visitWorkBench`, { replace: true }) setCurrent(2) } } @@ -185,15 +228,23 @@ <Step title='结案归档' disabled /> </Steps> </div> - <Preview style={{ display: isReview ? '' : 'none' }} /> - <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} /> + <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 82px 16px', height: 'calc(100vh - 231px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}> + <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} mainId={id} /> + </div> + <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' }}> + <Space size="middle" 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={handleReview}>{isReview ? '修改' : '预览'}</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> + <Button type='secondary' onClick={() => { navigate(-1) }}>返回上级页面</Button> </Space> </div> </Fragment> -- Gitblit v1.8.0