From 842aae506eebb6350de6fa291e8f3e514c93d16b Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Fri, 23 Aug 2024 14:11:30 +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 | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx index cfcb874..181b8e7 100644 --- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx +++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx @@ -15,6 +15,9 @@ import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react'; import KeyVisits from "./keyVisits"; import SelectUnitDialog from "./selectUnitDialog"; +import { + IconLink, +} from '@arco-design/web-react/icon'; const FormItem = Form.Item; const Option = Select.Option; @@ -57,13 +60,17 @@ onDrop={(e) => { }} tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' + showUploadList={{ + fileIcon: <IconLink style={{ color: '#1D2129' }} />, + }} /> </FormItem> </Col> <Col span={12}> <FormItem label={(<div style={{ display: 'flex' }}>姓名<div className="must">必填</div></div>)} - field='name' + field='trueName' + rules={[{ required: true, message: '请输入姓名' }]} > <Input placeholder='请填写' /> </FormItem> @@ -71,7 +78,11 @@ <Col span={12}> <FormItem label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)} - field='phone' + field='personNumber' + rules={[ + { required: true, message: '请输入联系方式' }, + { match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' }, + ]} > <Input placeholder='请填写' /> </FormItem> @@ -79,7 +90,8 @@ <Col span={12}> <FormItem label={(<div style={{ display: 'flex' }}>证件类型<div className="must">必填</div></div>)} - field='zhengjian' + field='docType' + rules={[{ required: true, message: '请选择证件类型' }]} > <Select placeholder='请选择' allowClear> {['居民身份证',].map((option, index) => ( @@ -93,8 +105,11 @@ <Col span={12}> <FormItem label={(<div style={{ display: 'flex' }}>证件号码<div className="must">必填</div></div>)} - rules={[{ required: true }]} - 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='mobile' > <InputSearch searchButton='读取卡证' @@ -103,24 +118,24 @@ </FormItem> </Col> <Col span={12}> - <FormItem label='联系地址' field='money'> + <FormItem label='联系地址' field='phoneAddress'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> - <FormItem label='户籍地址' field='money'> + <FormItem label='户籍地址' field='domicileAddress'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> - <FormItem label='工作单位' field='money'> + <FormItem label='工作单位' field='workUnit'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> <FormItem label='民族' - field='minzu' + field='nation' > <Select placeholder='请选择' allowClear> {['汉族',].map((option, index) => ( @@ -198,7 +213,7 @@ <FormItem label={isLegal ? '企业名称' : '机构名称'} rules={[{ required: true }]} - field='peopleNumber' + field='trueName' > <InputSearch searchButton='选择' @@ -208,7 +223,7 @@ </FormItem> </Col> <Col span={12}> - <FormItem label='联系方式' field='money'> + <FormItem label='联系方式' field='phoneNumber'> <Input placeholder='请填写' /> </FormItem> </Col> @@ -218,18 +233,18 @@ </FormItem> </Col> <Col span={12}> - <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='money'> + <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='mobile'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> - <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='money'> + <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='companyName'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> <FormItem - label={ isLegal ? '企业类型' : '机构类型'} + label={isLegal ? '企业类型' : '机构类型'} field='minzu' > <Select placeholder='请选择' allowClear> @@ -255,7 +270,15 @@ const handleSave = () => { if (formRef.current) { formRef.current.validate(undefined, (errors, values) => { - console.log(errors, values); + if (!errors) { + props.handleAddParty({ + ...values, + partyType: props.dialogType, + perClass: perClass, + perClassName: props.dialogType === 0 ? '申请方当事人' : '被申请方当事人' + }) + props.onClose() + } }); } } @@ -291,7 +314,7 @@ })} <Col span={24}> <Form - ref={props.formRef} + ref={formRef} layout='vertical' requiredSymbol={false} initialValues={{ -- Gitblit v1.8.0