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 | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
index 78003e0..582ff74 100644
--- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
@@ -12,8 +12,12 @@
caseperfection_organize,
caseperfection_organize_active,
} from '../../../../assets/images/icon';
-import { Form, Input, Button, Radio, Select, DatePicker, Cascader, Upload, Message } from '@arco-design/web-react';
+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;
@@ -23,7 +27,8 @@
export default function ApplyDialog(props) {
const formRef = useRef();
const [perClass, setPerClass] = useState('09_01001-1');
-
+ const [visible, setVisible] = useState(false);
+
const personIconType = (v) => {
switch (v) {
@@ -55,6 +60,9 @@
onDrop={(e) => {
}}
tip='支持png、jpg、pdf格式的图片上传，每次上传大小不超过10M'
+ showUploadList={{
+ fileIcon: <IconLink style={{ color: '#1D2129' }} />,
+ }}
/>
</FormItem>
</Col>
@@ -62,6 +70,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>姓名<div className="must">必填</div></div>)}
field='name'
+ rules={[{ required: true, message: '请输入姓名' }]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -70,6 +79,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
field='phone'
+ rules={[{ required: true, message: '请输入联系方式' }]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -77,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) => (
@@ -91,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
@@ -101,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) => (
@@ -157,11 +168,12 @@
)
} else {
//法人、非法人组织
+ let isLegal = type === '09_01001-2'
return (
<>
<Col span={24}>
<FormItem
- label='企业登记材料'
+ label={isLegal ? '企业登记材料' : '机构登记材料'}
field='file'
>
<Upload
@@ -177,7 +189,7 @@
</Col>
<Col span={24}>
<FormItem
- label='法定代表人身份证明材料'
+ label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'}
field='file1'
>
<Upload
@@ -193,13 +205,14 @@
</Col>
<Col span={12}>
<FormItem
- label='企业名称'
+ label={isLegal ? '企业名称' : '机构名称'}
rules={[{ required: true }]}
field='peopleNumber'
>
<InputSearch
searchButton='选择'
placeholder='请填写'
+ onSearch={handleSelect}
/>
</FormItem>
</Col>
@@ -209,23 +222,23 @@
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='企业所在地' field='money'>
+ <FormItem label={isLegal ? '企业所在地' : '机构所在地'} field='money'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='统一社会信用代码' field='money'>
+ <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='money'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='法定代表人' field='money'>
+ <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='money'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
<FormItem
- label='企业类型'
+ label={isLegal ? '企业类型' : '机构类型'}
field='minzu'
>
<Select placeholder='请选择' allowClear>
@@ -256,6 +269,11 @@
}
}
+ //选择
+ const handleSelect = (value) => {
+ setVisible(true)
+ }
+
return (
<div className="applyDialog">
<div style={{ height: '590px', overflowY: 'scroll' }}>
@@ -282,16 +300,17 @@
})}
<Col span={24}>
<Form
- ref={props.formRef}
+ ref={formRef}
layout='vertical'
requiredSymbol={false}
initialValues={{
}}//默认值
>
- <Row gutter={[32, 0]}>{formType(perClass)}</Row>
+ <Row gutter={[32, 0]} style={{ margin: '0 -10px' }}>{formType(perClass)}</Row>
</Form>
</Col>
</Row>
+
{/* 重复来访重点人员 */}
<div style={{ width: 'calc(100% - 9px)', background: '#f2f3f5', marginBottom: '20px', padding: '12px' }}>
<KeyVisits />
@@ -309,6 +328,17 @@
重置
</Button>
</div>
+ <Modal
+ title={'选择单位'}
+ visible={visible}
+ onOk={() => setVisible(false)}
+ onCancel={() => setVisible(false)}
+ autoFocus={false}
+ focusLock={true}
+ footer={null}
+ >
+ <SelectUnitDialog />
+ </Modal>
</div>
)
}
--
Gitblit v1.8.0