From 2a165a8e70947fe1a3641ea328d1f6daf7fff459 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Fri, 30 Aug 2024 09:47:36 +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 | 223 +++++++++++++++++++++++++------------------------------
1 files changed, 102 insertions(+), 121 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 95f20c8..57329ba 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -9,7 +9,6 @@
applyMaterials_active,
evidenceMaterials,
evidenceMaterials_active,
-
} from '@/assets/images';
import { CheckOutlined, } from '@ant-design/icons';
import TableView from '@/components/TableView';
@@ -17,18 +16,19 @@
import ApplyDialog from "./applyDialog";
import AgentDialog from "./agentDialog";
import DetailDialog from "./detailDialog";
-import FilesCheck from '../../../filesCheck';
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;
-const Option = Select.Option;
const InputSearch = Input.Search;
+
+function getId() {
+ return $$.ax.request({ url: `caseUtils/getNewTimeId`, type: 'get', service: 'utils' });
+}
const VisitorRegister = (props) => {
@@ -36,29 +36,32 @@
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [scanFile, setScanFile] = useState(false);
- const [filesList, setFilesList] = useState([]);
const [scanImage, setScanImage] = useState(false);
const [scaned, setScaned] = useState(false);
const [upload, setUpLoad] = useState(false);
const [sourceType, setSourceType] = useState('09_01010-1');
const [filesCheck, setFilesCheck] = useState(false);
const [fileView, setFileView] = useState();
- const [selectedAddress, setSelectedAddress] = useState('');
const [fileTip, setFileTip] = useState('0');
const [detailVisabled, setDetailVisabled] = useState(false);//查看信息弹窗控制
const [mapView, setMapView] = useState(false);
- 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' },
- { label: '地址2', value: 'address2' },
- // 更多地址...
- ];
-
const [agentVisible, setAgentVisible] = useState(false);
+ const peopleMap = {
+ '15_020008-1': '申请方',
+ '15_020008-2': '被申请方',
+ '24_00006-1': '申请方代理人',
+ '24_00006-2': '被申请方代理人'
+ }
+
+ useEffect(() => {
+ if (props.formRef.current) {
+ //引入当事人数据
+ props.formRef.current.setFieldValue('fakeData', fakeData)
+ }
+ }, [fakeData])
const personIconType = (v) => {
switch (v) {
@@ -149,21 +152,6 @@
</>
)
}
- }
-
- const formItemLayout = {
- labelCol: {
- span: 4,
- },
- wrapperCol: {
- span: 17,
- },
- };
-
- const peopleMap = {
- 0: '申请方',
- 1: '被申请方',
- 2: '代理人'
}
const fakeData1 = [
@@ -273,41 +261,6 @@
// 更多列配置...
];
- const options = [
- {
- value: 'beijing',
- label: 'Beijing',
- children: [
- {
- value: 'Beijing',
- label: 'Beijing',
- children: [
- {
- value: 'chaoyang',
- label: 'Chaoyang',
- },
- ],
- },
- ],
- },
- {
- value: 'shanghai',
- label: 'Shanghai',
- children: [
- {
- value: 'shanghaishi',
- label: 'Shanghai',
- children: [
- {
- value: 'huangpu',
- label: 'Huangpu',
- },
- ],
- },
- ],
- },
- ];
-
const options1 = [
{
value: 'jingjijiufen',
@@ -335,10 +288,20 @@
},
];
+ //获取id
+ const getAppId = async (value) => {
+ const res = await getId()
+ if (res.type) {
+ setFakeData([...fakeData, {
+ ...value,
+ id: res.data
+ }])
+ }
+ }
+
//查看
const handleCheckParty = (value) => {
- console.log(value);
- setDialogType(value.partyType)
+ setDialogType(value.perType)
setDetailVisabled(true)
}
@@ -354,9 +317,9 @@
return `${year}-${month}-${day} ${hours}:${minutes}`;
}
- //添加申请人: 0、被申请人: 1、申请代理人: 2、被申请代理人：3
+ //添加当事人
const handleAdd = (type) => {
- if (type === 2 || type === 3) {
+ if (type === '24_00006-1' || type === '24_00006-2') {
setAgentVisible(true)
} else {
setAddVisabled(true)
@@ -364,14 +327,8 @@
setDialogType(type)
}
-
- const handleAddressChange = (value) => {
- setSelectedAddress(value);
- };
-
//添加当事人
const handleAddParty = (value) => {
- console.log(value,'value1');
if (value.id) {
//编辑
const newList = fakeData.map(item => {
@@ -384,11 +341,7 @@
setFakeData(newList)
setEditData(null)
} else {
- setFakeData([...fakeData, {
- ...value,
- id: flagId
- }])
- setFlagId(flagId + 1)
+ getAppId(value)
}
}
@@ -401,14 +354,14 @@
//编辑
const handleEdit = (value) => {
- console.log(value);
- if (value.partyType === 0 || value.partyType === 1) {
+ if (value.perType === '15_020008-1' || value.perType === '15_020008-2') {
//当事人
setAddVisabled(true)
} else {
//代理人
setAgentVisible(true)
}
+ setDialogType(value.perType)
setEditData(value)
}
@@ -424,7 +377,6 @@
<div style={{ margin: '16px 0' }}>
<PersonCard
isCheck={true}
- partyType={'applicant'} // 这里设定为申请人
data={fakeData}
handleCheckParty={handleCheckParty}
handleAdd={handleAdd}
@@ -443,32 +395,29 @@
requiredSymbol={false}
scrollToFirstError={true}
initialValues={{
- level: '三级',
- visitingTime: getFormattedDateTime(),
- isSerious: '否',
+ caseLevel: 3,
+ visitTime: getFormattedDateTime(),
+ majorStatus: 0,
}}//默认值
>
<Row gutter={[32, 0]}>
<Col span={8}>
- <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}>
- {option}
- </Option>
- ))}
+ <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='caseLevel'
+ >
+ <Select placeholder='请选择事项等级' allowClear options={$$.options.caseLevelList}>
</Select>
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='来访时间' field='visitingTime'>
+ <FormItem label='来访时间' field='visitTime'>
<DatePicker
style={{ width: '100%' }}
format='YYYY-MM-DD HH:mm'
@@ -477,15 +426,15 @@
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='来访人数（人）' field='visitingNumber'>
- <InputNumber placeholder='请填写' />
+ <FormItem label='来访人数（人）' field='visitPeopleNum'>
+ <InputNumber placeholder='请填写' min={1} />
</FormItem>
</Col>
<Col span={8}>
<FormItem
label={(<div style={{ display: 'flex' }}>纠纷类型<div className="must">必填</div></div>)}
rules={[{ message: '请选择纠纷类型', required: true }]}
- field='disputeType'
+ field='caseType'
>
<Cascader
placeholder='请选择'
@@ -493,7 +442,6 @@
onChange={(value, option) => {
console.log(value, option);
}}
- // defaultValue={['shanghai', 'shanghaishi', 'huangpu']}
allowClear
/>
</FormItem>
@@ -502,8 +450,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>纠纷发生时间<div className="must">必填</div></div>)}
rules={[{ message: '请选择纠纷发生时间', required: true }]}
- field='disputeTime'
-
+ field='occurTime'
>
<DatePicker
style={{ width: '100%' }}
@@ -517,7 +464,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>纠纷发生地点<div className="must">必填</div></div>)}
rules={[{ message: '请选择纠纷发生地点', required: true }]}
- field='disputeAddress'
+ field='addr'
>
<InputSearch
placeholder='选择纠纷发生地的详细地址'
@@ -531,22 +478,46 @@
<FormItem label='问题属地' field='quesAddress'>
<Cascader
placeholder='请选择'
- options={options}
+ options={$$.locationOption()}
+ showSearch
onChange={(value, option) => {
- console.log(value, option);
+ if (option) {
+ props.formRef.current.setFieldsValue({
+ queProv: option[0].value,
+ queProvName: option[0].label,
+ queCity: option[1].value,
+ queCityName: option[1].label,
+ queArea: option[2].value,
+ queAreaName: option[2].label,
+ queRoad: option[3] && option[3].value || '',
+ queRoadName: option[3] && option[3].label || '',
+ })
+ } else {
+ //清除数据
+ props.formRef.current.setFieldsValue({
+ queProv: undefined,
+ queProvName: undefined,
+ queCity: undefined,
+ queCityName: undefined,
+ queArea: undefined,
+ queAreaName: undefined,
+ queRoad: undefined,
+ queRoadName: undefined,
+ })
+ }
}}
allowClear
/>
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='涉及人数（人）' field='peopleNumber'>
+ <FormItem label='涉及人数（人）' field='peopleNum'>
<InputNumber placeholder='请填写' />
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='涉及金额（元）' field='money'>
+ <FormItem label='涉及金额（元）' field='amount'>
<InputNumber placeholder='请填写' />
</FormItem>
</Col>
@@ -562,7 +533,7 @@
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
- field='summarize'
+ field='caseDes'
rules={[{ message: '请填写事项概况', required: true }]}
>
<Input.TextArea
@@ -586,7 +557,7 @@
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
- field='apply'
+ field='caseClaim'
rules={[{ message: '请填写申请请求', required: true }]}
>
@@ -603,12 +574,12 @@
<FormItem
label='是否重大矛盾纠纷'
style={{ width: '300px', marginBottom: 0 }}
- field='isSerious'
+ field='majorStatus'
layout='horizontal'
labelCol={{ span: 11 }}
wrapperCol={{ span: 13 }}
>
- <RadioGroup options={['否', '是']} />
+ <RadioGroup options={[{ value: 0, label: '否' }, { value: 1, label: '是' }]} />
</FormItem>
</div>
</Row>
@@ -748,10 +719,13 @@
{/* </div> */}
</Modal>
<Modal
- title={'添加' + peopleMap[dialogType]}
+ title={(editData ? '修改' : '添加') + peopleMap[dialogType]}
visible={addVisabled}
onOk={() => setAddVisabled(false)}
- onCancel={() => setAddVisabled(false)}
+ onCancel={() => {
+ setAddVisabled(false)
+ setEditData(null)
+ }}
autoFocus={false}
focusLock={true}
footer={null}
@@ -766,10 +740,13 @@
/>
</Modal>
<Modal
- title={'添加代理人'}
+ title={(editData ? '修改' : '添加') + peopleMap[dialogType]}
visible={agentVisible}
onOk={() => setAgentVisible(false)}
- onCancel={() => setAgentVisible(false)}
+ onCancel={() => {
+ setAgentVisible(false)
+ setEditData(null)
+ }}
autoFocus={false}
focusLock={true}
footer={null}
@@ -808,8 +785,12 @@
maskClosable={false}
>
<MapView
- selectAdd={(value) => {
- props.formRef.current.setFieldValue('disputeAddress', value)
+ selectAdd={(data) => {
+ props.formRef.current.setFieldsValue({
+ addr: data.addName,
+ lng: data.pt.lng,
+ lat: data.pt.lat,
+ })
setMapView(false)
}}
/>
--
Gitblit v1.8.0