From 9a2277d39b55461967a7fc67201e524b89daa03e Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Tue, 03 Sep 2024 09:59:47 +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 | 233 ++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 146 insertions(+), 87 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..c16b16e 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'; @@ -13,21 +13,30 @@ caseperfection_organize_active, } from '@/assets/images/icon'; import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react'; -import KeyVisits from "./keyVisits"; +import KeyVisits from "@/components/personCard/KeyVisits"; import SelectUnitDialog from "./selectUnitDialog"; -import { - IconLink, -} from '@arco-design/web-react/icon'; +import ArcoUpload from '@/components/ArcoUpload'; const FormItem = Form.Item; const Option = Select.Option; const InputSearch = Input.Search; const RadioGroup = Radio.Group; +const appUrl = $$.appUrl; + + +function getId() { + return $$.ax.request({ url: `caseUtils/getNewTimeId`, type: 'get', service: 'utils' }); +} + +function delFile(id) { + return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } }); +} export default function ApplyDialog(props) { const formRef = useRef(); const [perClass, setPerClass] = useState('09_01001-1'); const [visible, setVisible] = useState(false); + const [id, setId] = useState() useEffect(() => { if (props.editData) { @@ -35,9 +44,20 @@ formRef.current.setFieldsValue({ ...props.editData }) + setPerClass(props.editData.perClass) + setId(props.editData.id) + } else { + getAppId() } }, []) + //获取id + const getAppId = async () => { + const res = await getId() + if (res.type) { + setId(res.data) + } + } const personIconType = (v) => { switch (v) { @@ -50,6 +70,27 @@ } } + //上传身份证识别 + const handleChangeFile = (data) => { + if (data.data && data.data.length != 0) { + if (data.data[0].idcardOcrResult) { + const { birthday, ...rest } = data.data[0].idcardOcrResult + //回填信息 + formRef.current.setFieldsValue({ + ...rest + }) + } + } + } + + //删除文件 + const handleDelFile = async (id) => { + const res = await delFile(id) + if (res.type) { + $$.infoSuccess({ content: '删除成功!' }); + } + } + //页面返回 const formType = (type) => { if (type === '09_01001-1') { @@ -57,23 +98,16 @@ return ( <> <Col span={24}> - <FormItem - label='身份证明材料' + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&ownerId=${id}&ownerType=22_00018-202`, + }} field='file' - > - <Upload - drag - multiple - accept='image/*' - action='/' - onDrop={(e) => { - }} - tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' - showUploadList={{ - fileIcon: <IconLink style={{ color: '#1D2129' }} />, - }} - /> - </FormItem> + handleChangeFile={handleChangeFile} + label='身份证明材料' + editData={props.editData} + handleDelFile={handleDelFile} + /> </Col> <Col span={12}> <FormItem @@ -87,7 +121,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 +133,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 +153,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 +162,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 +190,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 +204,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> @@ -191,41 +235,31 @@ return ( <> <Col span={24}> - <FormItem - label={isLegal ? '企业登记材料' : '机构登记材料'} + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&ownerId=${id}&ownerType=22_00018-202`, + }} field='file' - > - <Upload - drag - multiple - accept='image/*' - action='/' - onDrop={(e) => { - }} - tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' - /> - </FormItem> + label={isLegal ? '企业登记材料' : '机构登记材料'} + editData={props.editData} + handleDelFile={handleDelFile} + /> </Col> <Col span={24}> - <FormItem - label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'} + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&ownerId=${id}&ownerType=22_00018-202`, + }} field='file1' - > - <Upload - drag - multiple - accept='image/*' - action='/' - onDrop={(e) => { - }} - tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' - /> - </FormItem> + label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'} + editData={props.editData} + handleDelFile={handleDelFile} + /> </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 +270,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={isLegal ? $$.options.enterpriseType : $$.options.orgaType} + 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,18 +326,21 @@ if (formRef.current) { formRef.current.validate(undefined, (errors, values) => { if (!errors) { + const fieldValue = formRef.current.getFields() + console.log(fieldValue); if (props.editData) { props.handleAddParty({ - ...props.editData, - ...values - }) + ...fieldValue + }, true) } 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, + id: id + }, false) } props.onClose() } @@ -359,7 +404,21 @@ > 保存 </Button> - <Button className="dialogBack"> + <Button + className="dialogBack" + onClick={() => { + if (props.editData) { + formRef.current.resetFields(); + formRef.current.setFieldsValue({ + ...props.editData + }) + setPerClass(props.editData.perClass) + } else { + formRef.current.resetFields(); + setPerClass('09_01001-1') + } + }} + > 重置 </Button> </div> -- Gitblit v1.8.0