From 7bec45c3da050deda516f96b0a89f94b06814ae9 Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Tue, 10 Sep 2024 16:59:11 +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 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx index 85320b6..1d0c75d 100644 --- a/gz-customerSystem/src/views/register/visit/index.jsx +++ b/gz-customerSystem/src/views/register/visit/index.jsx @@ -2,13 +2,13 @@ * @Author: dminyi 1301963064@qq.com * @Date: 2024-08-09 09:59:43 * @LastEditors: lwh - * @LastEditTime: 2024-09-10 11:20:47 + * @LastEditTime: 2024-09-10 16:59:07 * @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 { useParams, useNavigate } from 'react-router-dom'; import NewPage from '@/components/NewPage'; import * as $$ from '@/utils/utility'; import "@arco-themes/react-gzzz/css/arco.css"; @@ -17,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; @@ -102,7 +101,6 @@ }) }, }); - } }); } @@ -200,7 +198,9 @@ <Step title='结案归档' disabled /> </Steps> </div> - <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} /> + <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}> + <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} mainId={id} /> + </div> <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} -- Gitblit v1.8.0