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 | 197 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 141 insertions(+), 56 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..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,13 @@
caseperfection_legal_active,
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 KeyVisits from "./keyVisits";
+} from '@/assets/images/icon';
+import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react';
+import KeyVisits from "@/components/personCard/KeyVisits";
+import SelectUnitDialog from "./selectUnitDialog";
+import {
+ IconLink,
+} from '@arco-design/web-react/icon';
const FormItem = Form.Item;
const Option = Select.Option;
@@ -23,7 +27,18 @@
export default function ApplyDialog(props) {
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) {
@@ -55,13 +70,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>
@@ -69,7 +88,11 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
- field='phone'
+ field='mobile'
+ rules={[
+ { required: true, message: '请输入联系方式' },
+ { match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' },
+ ]}
>
<Input placeholder='请填写' />
</FormItem>
@@ -77,22 +100,27 @@
<Col span={12}>
<FormItem
label={(<div style={{ display: 'flex' }}>证件类型<div className="must">必填</div></div>)}
- field='zhengjian'
+ 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 }]}
- 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='读取卡证'
@@ -101,31 +129,38 @@
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='联系地址' field='money'>
+ <FormItem label='联系地址' field='addr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='户籍地址' field='money'>
+ <FormItem label='户籍地址' field='placeAddr'>
<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) => (
- <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>
@@ -136,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>
@@ -157,11 +198,12 @@
)
} else {
//法人、非法人组织
+ let isLegal = type === '09_01001-2'
return (
<>
<Col span={24}>
<FormItem
- label='企业登记材料'
+ label={isLegal ? '企业登记材料' : '机构登记材料'}
field='file'
>
<Upload
@@ -177,7 +219,7 @@
</Col>
<Col span={24}>
<FormItem
- label='法定代表人身份证明材料'
+ label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'}
field='file1'
>
<Upload
@@ -193,52 +235,61 @@
</Col>
<Col span={12}>
<FormItem
- label='企业名称'
- 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='选择'
placeholder='请填写'
+ onSearch={handleSelect}
/>
</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='企业所在地' field='money'>
+ <FormItem label={isLegal ? '企业所在地' : '机构所在地'} field='addr'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='统一社会信用代码' field='money'>
+ <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='orgaCode'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
- <FormItem label='法定代表人' field='money'>
+ <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='deputy'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={12}>
<FormItem
- label='企业类型'
- field='minzu'
+ label={isLegal ? '企业类型' : '机构类型'}
+ 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>
@@ -251,9 +302,30 @@
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()
+ }
});
}
+ }
+
+ //选择
+ const handleSelect = (value) => {
+ setVisible(true)
}
return (
@@ -282,16 +354,18 @@
})}
<Col span={24}>
<Form
- ref={props.formRef}
+ ref={formRef}
layout='vertical'
requiredSymbol={false}
initialValues={{
}}//默认值
+ scrollToFirstError
>
- <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 />
@@ -303,12 +377,23 @@
className="dialogPrimary"
onClick={handleSave}
>
- 保存信息
+ 保存
</Button>
<Button className="dialogBack">
重置
</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