From a7cba2f05df12ab546ef1c20b63aad10ec0e7a5c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Fri, 30 Aug 2024 16:45:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/visit/component/applyDialog.jsx | 153 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 104 insertions(+), 49 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
index 582ff74..2fb2b3e 100644
--- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useRef, Fragment } from "react";
-import * as $$ from '../../../../utils/utility';
-import { Row, Col, Space } from 'antd';
+import * as $$ from '@/utils/utility';
+import { Row, Col } from 'antd';
import {
CheckOutlined,
} from '@ant-design/icons';
@@ -11,9 +11,9 @@
caseperfection_legal_active,
caseperfection_organize,
caseperfection_organize_active,
-} from '../../../../assets/images/icon';
+} from '@/assets/images/icon';
import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react';
-import KeyVisits from "./keyVisits";
+import KeyVisits from "@/components/personCard/KeyVisits";
import SelectUnitDialog from "./selectUnitDialog";
import {
IconLink,
@@ -28,7 +28,17 @@
const formRef = useRef();
const [perClass, setPerClass] = useState('09_01001-1');
const [visible, setVisible] = useState(false);
-
+
+ useEffect(() => {
+ if (props.editData) {
+ //编辑
+ formRef.current.setFieldsValue({
+ ...props.editData
+ })
+ setPerClass(props.editData.perClass)
+ }
+ }, [])
+
const personIconType = (v) => {
switch (v) {
@@ -69,7 +79,7 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>姓名<div className="must">必填</div></div>)}
- field='name'
+ field='trueName'
rules={[{ required: true, message: '请输入姓名' }]}
>
<Input placeholder='请填写' />
@@ -78,8 +88,11 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
- field='phone'
- rules={[{ required: true, message: '请输入联系方式' }]}
+ field='mobile'
+ rules={[
+ { required: true, message: '请输入联系方式' },
+ { match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' },
+ ]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -87,23 +100,27 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>证件类型<div className="must">必填</div></div>)}
- field='docType'
+ field='certiType'
rules={[{ required: true, message: '请选择证件类型' }]}
>
- <Select placeholder='请选择' allowClear>
- {['居民身份证',].map((option, index) => (
- <Option key={option} value={option}>
- {option}
- </Option>
- ))}
- </Select>
+ <Select
+ placeholder='请选择'
+ allowClear
+ options={$$.options.cardType}
+ onChange={(value, options) => {
+ formRef.current.setFieldValue('certiTypeName', options && options.children)
+ }}
+ />
</FormItem>
</Col>
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>证件号码<div className="must">必填</div></div>)}
- rules={[{ required: true, message: '请输入证件号码' }]}
- field='peopleNumber'
+ rules={[
+ { required: true, message: '请输入证件号码' },
+ { match: /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])\d{3}(\d|X)$/, message: '请输入正确的证件号码' }
+ ]}
+ field='certiNo'
>
<InputSearch
searchButton='读取卡证'
@@ -112,12 +129,12 @@
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='联系地址' field='phoneAddress'>
+ <FormItem label='联系地址' field='addr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='户籍地址' field='domicileAddress'>
+ <FormItem label='户籍地址' field='placeAddr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
@@ -131,12 +148,19 @@
label='民族'
field='nation'
>
- <Select placeholder='请选择' allowClear>
- {['汉族',].map((option, index) => (
- <Option key={option} value={option}>
- {option}
- </Option>
- ))}
+ <Select
+ placeholder='请选择'
+ allowClear
+ showSearch
+ options={$$.options.nation}
+ filterOption={(inputValue, option) =>
+ option.props.value.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0 ||
+ option.props.children.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0
+ }
+ onChange={(value, options) => {
+ formRef.current.setFieldValue('nationName', options && options.children)
+ }}
+ >
</Select>
</FormItem>
</Col>
@@ -147,20 +171,26 @@
>
<RadioGroup
type='button'
+ options={$$.options.sex}
+ onChange={(value, options) => {
+ if (value) {
+ formRef.current.setFieldValue('sexName', value === '09_00003-1' ? '男' : '女')
+ } else {
+ formRef.current.setFieldValue('sexName', '')
+ }
+ }}
>
- <Radio value='0'>男</Radio>
- <Radio value='1'>女</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col span={12}>
<FormItem
label='是否极具个人极端倾向'
- field='isBad'
+ field='extreme'
>
<RadioGroup>
- <Radio value='0'>否</Radio>
- <Radio value='1'>是</Radio>
+ <Radio value={0}>否</Radio>
+ <Radio value={1}>是</Radio>
</RadioGroup>
</FormItem>
</Col>
@@ -205,9 +235,9 @@
</Col>
<Col span={12}>
<FormItem
- label={isLegal ? '企业名称' : '机构名称'}
- rules={[{ required: true }]}
- field='peopleNumber'
+ label={(<div style={{ display: 'flex' }}>{isLegal ? '企业名称' : '机构名称'}<div className="must">必填</div></div>)}
+ rules={[{ required: true, message: '请输入' + isLegal ? '企业名称' : '机构名称' }]}
+ field='trueName'
>
<InputSearch
searchButton='选择'
@@ -217,41 +247,49 @@
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='联系方式' field='money'>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
+ field='mobile'
+ rules={[
+ { required: true, message: '请输入联系方式' },
+ { match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' },
+ ]}
+ >
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label={isLegal ? '企业所在地' : '机构所在地'} field='money'>
+ <FormItem label={isLegal ? '企业所在地' : '机构所在地'} field='addr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='money'>
+ <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='orgaCode'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='money'>
+ <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='deputy'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
<FormItem
label={isLegal ? '企业类型' : '机构类型'}
- field='minzu'
+ field='orgaType'
>
- <Select placeholder='请选择' allowClear>
- {['餐饮服务',].map((option, index) => (
- <Option key={option} value={option}>
- {option}
- </Option>
- ))}
- </Select>
+ <Select
+ placeholder='请选择'
+ allowClear
+ options={$$.options.agentType}
+ onChange={(value, options) => {
+ formRef.current.setFieldValue('orgaTypeName', options && options.children)
+ }}
+ />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='住所' field='money'>
+ <FormItem label='住所' field='placeAddr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
@@ -264,7 +302,23 @@
const handleSave = () => {
if (formRef.current) {
formRef.current.validate(undefined, (errors, values) => {
- console.log(errors, values);
+ if (!errors) {
+ const fieldValue = formRef.current.getFields()
+ if (props.editData) {
+ props.handleAddParty({
+ ...fieldValue
+ })
+ } else {
+ props.handleAddParty({
+ ...fieldValue,
+ perType: props.dialogType,
+ perClass: perClass,
+ perTypeName: $$.options.personType.find(item => item.value === props.dialogType).label,
+ perClassName: $$.options.personClass.find(item => item.value === perClass).label
+ })
+ }
+ props.onClose()
+ }
});
}
}
@@ -305,6 +359,7 @@
requiredSymbol={false}
initialValues={{
}}//默认值
+ scrollToFirstError
>
<Row gutter={[32, 0]} style={{ margin: '0 -10px' }}>{formType(perClass)}</Row>
</Form>
@@ -322,7 +377,7 @@
className="dialogPrimary"
onClick={handleSave}
>
- 保存信息
+ 保存
</Button>
<Button className="dialogBack">
重置
--
Gitblit v1.8.0