From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/component/applyDialog.jsx | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..582ff74 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;
@@ -25,7 +28,7 @@
const formRef = useRef();
const [perClass, setPerClass] = useState('09_01001-1');
const [visible, setVisible] = useState(false);
-
+
const personIconType = (v) => {
switch (v) {
@@ -57,6 +60,9 @@
onDrop={(e) => {
}}
tip='支持png、jpg、pdf格式的图片上传，每次上传大小不超过10M'
+ showUploadList={{
+ fileIcon: <IconLink style={{ color: '#1D2129' }} />,
+ }}
/>
</FormItem>
</Col>
@@ -64,6 +70,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>姓名<div className="must">必填</div></div>)}
field='name'
+ rules={[{ required: true, message: '请输入姓名' }]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -72,6 +79,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
field='phone'
+ rules={[{ required: true, message: '请输入联系方式' }]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -79,7 +87,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,7 +102,7 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>证件号码<div className="must">必填</div></div>)}
- rules={[{ required: true }]}
+ rules={[{ required: true, message: '请输入证件号码' }]}
field='peopleNumber'
>
<InputSearch
@@ -103,24 +112,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) => (
@@ -229,7 +238,7 @@
</Col>
<Col span={12}>
<FormItem
- label={ isLegal ? '企业类型' : '机构类型'}
+ label={isLegal ? '企业类型' : '机构类型'}
field='minzu'
>
<Select placeholder='请选择' allowClear>
@@ -291,7 +300,7 @@
})}
<Col span={24}>
<Form
- ref={props.formRef}
+ ref={formRef}
layout='vertical'
requiredSymbol={false}
initialValues={{
--
Gitblit v1.8.0