From d3eefcaf3762ca97483e1517697b6941bd9a58d8 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 28 Aug 2024 09:51:50 +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/component/visitorRegister.jsx | 163 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 98 insertions(+), 65 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index f3a4fbc..1ea16e6 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -1,9 +1,8 @@
import React, { useState, useEffect, useRef } from "react";
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 PersonCard from '../../../../components/personCard';
-import * as $$ from '../../../../utils/utility';
+import PersonCard from '@/components/personCard';
+import * as $$ from '@/utils/utility';
import {
question1,
applyMaterials,
@@ -11,10 +10,9 @@
evidenceMaterials,
evidenceMaterials_active,
-} from '../../../../assets/images';
+} from '@/assets/images';
import { CheckOutlined, } from '@ant-design/icons';
-import "@arco-design/web-react/dist/css/arco.css";
-import TableView from '../../../../components/TableView';
+import TableView from '@/components/TableView';
import '../../index.less';
import ApplyDialog from "./applyDialog";
import AgentDialog from "./agentDialog";
@@ -23,6 +21,9 @@
import NewFileCheck from '../../../filesCheck/newFileCheck';
import { IconLink } from '@arco-design/web-react/icon';
import MapView from './map'
+import { scan } from '@/assets/images/icon'
+import MyDrawer from '@/components/MyDrawer';
+import { EventLevelDrawer, MattersDetail } from './levelDetail'
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息
const FormItem = Form.Item;
@@ -46,9 +47,10 @@
const [fileTip, setFileTip] = useState('0');
const [detailVisabled, setDetailVisabled] = useState(false);//查看信息弹窗控制
const [mapView, setMapView] = useState(false);
- const [flagId, setFlagId] = useState(0);//赋予当事人唯一id，用于删除
- const formRef = useRef();
-
+ const [flagId, setFlagId] = useState(1);//赋予当事人唯一id，用于删除
+ const [visible, setVisible] = useState(false);
+ const [apply, setApply] = useState(false);
+ const [editData, setEditData] = useState(null);
const addressOptions = [
{ label: '地址1', value: 'address1' },
@@ -248,7 +250,7 @@
},
{
- title: '上传时间',
+ title: '最新上传时间',
dataIndex: 'mediateUserName',
key: 'mediateUserName',
width: 180,
@@ -352,9 +354,9 @@
return `${year}-${month}-${day} ${hours}:${minutes}`;
}
- //添加申请人: 0、被申请人: 1、代理人: 2
+ //添加申请人: 0、被申请人: 1、申请代理人: 2、被申请代理人：3
const handleAdd = (type) => {
- if (type === 2) {
+ if (type === 2 || type === 3) {
setAgentVisible(true)
} else {
setAddVisabled(true)
@@ -369,12 +371,24 @@
//添加当事人
const handleAddParty = (value) => {
- console.log(value);
- setFakeData([...fakeData, {
- ...value,
- id: flagId
- }])
- setFlagId(flagId + 1)
+ if (value.id) {
+ //编辑
+ const newList = fakeData.map(item => {
+ if (item.id === value.id) {
+ return value
+ } else {
+ return item
+ }
+ })
+ setFakeData(newList)
+ setEditData(null)
+ } else {
+ setFakeData([...fakeData, {
+ ...value,
+ id: flagId
+ }])
+ setFlagId(flagId + 1)
+ }
}
//删除当事人
@@ -382,6 +396,19 @@
event.stopPropagation();
const filterData = fakeData.filter(item => item.id !== value.id)
setFakeData(filterData)
+ }
+
+ //编辑
+ const handleEdit = (value) => {
+ console.log(value);
+ if (value.partyType === 0 || value.partyType === 1) {
+ //当事人
+ setAddVisabled(true)
+ } else {
+ //代理人
+ setAgentVisible(true)
+ }
+ setEditData(value)
}
@@ -401,6 +428,7 @@
handleCheckParty={handleCheckParty}
handleAdd={handleAdd}
handleDeleteParty={handleDeleteParty}
+ handleEdit={handleEdit}
/>
</div>
<Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
@@ -421,7 +449,14 @@
>
<Row gutter={[32, 0]}>
<Col span={8}>
- <FormItem label='事项等级' field='level' tooltip={<div className='question'>Username is required </div>} >
+ <FormItem label={<div style={{ display: 'flex' }}>
+ 事项等级
+ <Tooltip onClick={() => setApply(true)}>
+ <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
+ </Tooltip>
+ </div>
+ }
+ field='level' >
<Select placeholder='Select city' allowClear>
{['一级', '二级', '三级', '四级'].map((option, index) => (
<Option key={option} value={option}>
@@ -518,10 +553,11 @@
<FormItem
label={<div style={{ display: 'flex' }}>
事项概况
- <Tooltip title='1111'>
- <img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} />
+ <Tooltip onClick={() => setVisible(true)}>
+ <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
</Tooltip>
- <div className="must">必填</div>
+ <div className="must" style={{ marginLeft: '4px' }}>必填</div>
+ <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
@@ -532,7 +568,7 @@
maxLength={2000}
showWordLimit
rows={5}
- placeholder='请填写问题发生的起因、过程和结果'
+ placeholder='请完整描述事项概况，应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过'
wrapperStyle={{ width: '100%' }}
/>
</FormItem>
@@ -541,10 +577,11 @@
<FormItem
label={<div style={{ display: 'flex' }}>
申请请求
- <Tooltip title='1111'>
- <img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} />
- </Tooltip>
+ {/* <Tooltip onClick={() => setApply(true)}>
+ <img src={question1} alt="" style={{ width: '13px', height: '13px', margin:'4px 4px 0px 4px' }} />
+ </Tooltip> */}
<div className="must">必填</div>
+ <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
@@ -561,14 +598,16 @@
/>
</FormItem>
</Col>
- <div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#F2F3F5', borderRadius: '2px', marginTop: '4px',display:'flex',alignItems:'center' }}>
+ <div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#F2F3F5', borderRadius: '2px', marginTop: '4px', display: 'flex', alignItems: 'center' }}>
<FormItem
label='是否重大矛盾纠纷'
- style={{ marginBottom: '-20px' }}
+ style={{ width: '300px', marginBottom: 0 }}
field='isSerious'
- // layout='inline'
+ layout='horizontal'
+ labelCol={{ span: 11 }}
+ wrapperCol={{ span: 13 }}
>
- <RadioGroup options={['否', '是']} style={{ marginBottom: 20 }} />
+ <RadioGroup options={['否', '是']} />
</FormItem>
</div>
</Row>
@@ -702,7 +741,7 @@
</Modal>
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
{/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */}
- <div style={{marginTop:'-16px'}}>
+ <div style={{ marginTop: '-16px' }}>
<NewFileCheck />
</div>
{/* </div> */}
@@ -715,11 +754,14 @@
autoFocus={false}
focusLock={true}
footer={null}
+ unmountOnExit={true}
+ maskClosable={false}
>
<ApplyDialog
dialogType={dialogType}
onClose={() => setAddVisabled(false)}
handleAddParty={handleAddParty}
+ editData={editData}
/>
</Modal>
<Modal
@@ -730,11 +772,15 @@
autoFocus={false}
focusLock={true}
footer={null}
+ unmountOnExit={true}
+ maskClosable={false}
>
<AgentDialog
handleAddParty={handleAddParty}
onClose={() => setAgentVisible(false)}
fakeData={fakeData}
+ dialogType={dialogType}
+ editData={editData}
/>
</Modal>
<Modal
@@ -745,44 +791,31 @@
autoFocus={false}
focusLock={true}
footer={null}
+ unmountOnExit={true}
+ maskClosable={false}
>
<DetailDialog />
</Modal>
- <Modal style={{ width: '1200px' }} visible={mapView} onCancel={() => setMapView(false)} footer={null} title='选择纠纷发生地' centered>
- <Row gutter={[16, 0]}>
- <Col span={16}>
- <Form
- ref={formRef}
- requiredSymbol={false}
- layout='inline'
- {...formItemLayout}
- style={{ marginBottom: '8px' }}
- >
- <FormItem
- label='查询位置：'
- field='name'
- onChange={(e) => console.log(e.target.value, 'vvv')}
- >
- <Input placeholder='请输入' style={{ width: '515px' }} />
- </FormItem>
- <Button style={{ marginRight: '20px' }}>
- 重置
- </Button>
- <Button
- type="primary"
- // onClick={handleSave}
- >
- 查询
- </Button>
- </Form>
- <MapView />
- </Col>
- <Col span={8}>
- <div style={{ color: '#86909C', marginTop: '43px' }}>附近地址</div>
- </Col>
-
- </Row>
+ <Modal
+ style={{ width: '1200px' }}
+ visible={mapView}
+ onCancel={() => setMapView(false)}
+ footer={null}
+ title='选择纠纷发生地'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ >
+ <MapView />
</Modal>
+ <MattersDetail
+ visible={visible}
+ onClose={() => setVisible(false)}
+ />
+ <EventLevelDrawer
+ visible={apply}
+ onClose={() => setApply(false)}
+ />
</div>
)
}
--
Gitblit v1.8.0