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/applyDialog.jsx | 96 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
index 95eca5e..f2cb86c 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 { Row, Col } from 'antd';
import {
CheckOutlined,
} from '@ant-design/icons';
@@ -35,6 +35,7 @@
formRef.current.setFieldsValue({
...props.editData
})
+ setPerClass(props.editData.perClass)
}
}, [])
@@ -87,7 +88,7 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
- field='personNumber'
+ field='mobile'
rules={[
{ required: true, message: '请输入联系方式' },
{ match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' },
@@ -99,16 +100,17 @@
<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}>
@@ -118,7 +120,7 @@
{ 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='mobile'
+ field='certiNo'
>
<InputSearch
searchButton='读取卡证'
@@ -127,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>
@@ -155,6 +157,9 @@
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>
@@ -166,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>
@@ -224,8 +235,8 @@
</Col>
<Col span={12}>
<FormItem
- label={isLegal ? '企业名称' : '机构名称'}
- rules={[{ required: true }]}
+ label={(<div style={{ display: 'flex' }}>{isLegal ? '企业名称' : '机构名称'}<div className="must">必填</div></div>)}
+ rules={[{ required: true, message: '请输入' + isLegal ? '企业名称' : '机构名称' }]}
field='trueName'
>
<InputSearch
@@ -236,41 +247,49 @@
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='联系方式' field='phoneNumber'>
+ <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='mobile'>
+ <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='orgaCode'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='companyName'>
+ <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>
@@ -284,17 +303,18 @@
if (formRef.current) {
formRef.current.validate(undefined, (errors, values) => {
if (!errors) {
+ const fieldValue = formRef.current.getFields()
if (props.editData) {
props.handleAddParty({
- ...props.editData,
- ...values
+ ...fieldValue
})
} else {
props.handleAddParty({
- ...values,
- partyType: props.dialogType,
+ ...fieldValue,
+ perType: props.dialogType,
perClass: perClass,
- perClassName: props.dialogType === 0 ? '申请方当事人' : '被申请方当事人'
+ perTypeName: $$.options.personType.find(item => item.value === props.dialogType).label,
+ perClassName: $$.options.personClass.find(item => item.value === perClass).label
})
}
props.onClose()
--
Gitblit v1.8.0