From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 78 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 6d50eca..76c0cd6 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -2,11 +2,10 @@
import { Row, Col, Space, Tooltip, Button } from 'antd';
import { Form, Input, Radio, Select, DatePicker, Cascader, Modal, Upload, InputNumber } from '@arco-design/web-react';
import "@arco-design/web-react/dist/css/arco.css";
-import MyModal from '../../../../components/MyModal';
import PersonCard from '../../../../components/personCard';
import * as $$ from '../../../../utils/utility';
import {
- question1, image, link,
+ question1,
applyMaterials,
applyMaterials_active,
evidenceMaterials,
@@ -19,14 +18,10 @@
import '../../index.less';
import ApplyDialog from "./applyDialog";
import AgentDialog from "./agentDialog";
+import DetailDialog from "./detailDialog";
import FilesCheck from '../../../filesCheck';
-import {
- IconFileAudio,
- IconClose,
- IconFaceFrownFill,
- IconUpload,
- IconLink,
-} from '@arco-design/web-react/icon';
+import NewFileCheck from '../../../filesCheck/newFileCheck';
+import { IconLink } from '@arco-design/web-react/icon';
import MapView from './map'
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息
@@ -39,15 +34,16 @@
const [dialogType, setDialogType] = useState(0);//添加当事人的类型
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([
- // {
- // id: 3,
- // perClassName: '申请方当事人',
- // trueName: '蓝海科技有限公司',
- // mobile: '9144010188453Z',
- // company: true,
- // companyName: '张晓梅',//公司法人
- // partyType: 'applicant',//申请人
- // },
+ {
+ id: 3,
+ perClassName: '申请方当事人',
+ trueName: '蓝海科技有限公司',
+ mobile: '9144010188453Z',
+ company: true,
+ companyName: '张晓梅',//公司法人
+ partyType: 'applicant',//申请人
+ type: 0,//申请人: 0、被申请人: 1、代理人: 2
+ },
// {
// id: 1,
// perClassName: '申请方代理人',
@@ -57,16 +53,17 @@
// personNumber: '13388888888',//联系方式
// partyType: 'applicant',
// },
- // {
- // id: 2,
- // perClassName: '被申请方当事人',
- // trueName: '大海科技有限公司',
- // mobile: '13800000002',
- // company: true,
- // companyName: '郭小聪',//公司法人
- // partyType: 'respondent',//被申请方
- // remark: [{ label: '精神障碍', color: '#C64FBE' }, { label: '吸毒', color: '#D8A247' }, { label: '社区矫正', color: '#B82F6E' }, { label: '刑满释放', color: '#199C8F' }, { label: '流浪', color: '#3ECB7A' }, { label: '重点青少年', color: '#117AC1' }, { label: '涉稳涉访', color: '#6865D7' }, { label: '潜在风险', color: '#2661CE' }]
- // },
+ {
+ id: 2,
+ perClassName: '被申请方当事人',
+ trueName: '大海科技有限公司',
+ mobile: '13800000002',
+ company: true,
+ companyName: '郭小聪',//公司法人
+ partyType: 'respondent',//被申请方
+ type: 1,
+ remark: [{ label: '精神障碍', color: '#C64FBE' }, { label: '吸毒', color: '#D8A247' }, { label: '社区矫正', color: '#B82F6E' }, { label: '刑满释放', color: '#199C8F' }, { label: '流浪', color: '#3ECB7A' }, { label: '重点青少年', color: '#117AC1' }, { label: '涉稳涉访', color: '#6865D7' }, { label: '潜在风险', color: '#2661CE' }]
+ },
// {
// id: 2,
// perClassName: '被申请方代理人',
@@ -108,6 +105,7 @@
const [fileView, setFileView] = useState();
const [selectedAddress, setSelectedAddress] = useState('');
const [fileTip, setFileTip] = useState('0');
+ const [detailVisabled, setDetailVisabled] = useState(false);//查看信息弹窗控制
const [mapView, setMapView] = useState(false);
const formRef = useRef();
@@ -398,8 +396,11 @@
},
];
- const handleCheckParty = () => {
- console.log('check party');
+ //查看
+ const handleCheckParty = (value) => {
+ console.log(value);
+ setDialogType(value.type)
+ setDetailVisabled(true)
}
//获取当前时间
@@ -413,9 +414,6 @@
return `${year}-${month}-${day} ${hours}:${minutes}`;
}
-
-
-
//添加申请人: 0、被申请人: 1、代理人: 2
const handleAdd = (type) => {
@@ -751,7 +749,7 @@
</Modal>
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
<div className="mediationWindow-modal-main" style={{ display: 'flex' }}>
- <FilesCheck />
+ <NewFileCheck />
</div>
</Modal>
<Modal
@@ -762,7 +760,6 @@
autoFocus={false}
focusLock={true}
footer={null}
- // style={{ width: '1000px' }}
>
<ApplyDialog />
</Modal>
@@ -777,6 +774,17 @@
>
<AgentDialog />
</Modal>
+ <Modal
+ title={'查看' + peopleMap[dialogType]}
+ visible={detailVisabled}
+ onOk={() => setDetailVisabled(false)}
+ onCancel={() => setDetailVisabled(false)}
+ autoFocus={false}
+ focusLock={true}
+ footer={null}
+ >
+ <DetailDialog />
+ </Modal>
<Modal style={{ width: '1200px' }} visible={mapView} onCancel={() => setMapView(false)} footer={null} title='选择纠纷发生地' centered>
<Row gutter={[16, 0]}>
<Col span={16}>
--
Gitblit v1.8.0