From f6939b0ec6680da8416a3161b524e7b73a7a3db8 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Tue, 10 Sep 2024 16:55:34 +0800 Subject: [PATCH] fix: delete改回get请求 --- gz-customerSystem/src/views/register/visit/component/applyDialog.jsx | 303 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 205 insertions(+), 98 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..cb72582 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,21 +11,55 @@ caseperfection_legal_active, caseperfection_organize, caseperfection_organize_active, -} from '../../../../assets/images/icon'; +} 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 ArcoUpload from '@/components/ArcoUpload'; +import { Scrollbars } from "react-custom-scrollbars"; 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) { + console.log(props.editData); + //编辑 + 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) { @@ -38,32 +72,51 @@ } } + //上传身份证识别 + 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') { //自然人 return ( <> - <Col span={24}> - <FormItem - label='身份证明材料' + <Col span={24} className="doubleFile"> + <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> + handleChangeFile={handleChangeFile} + label='身份证明材料' + editData={props.editData} + handleDelFile={handleDelFile} + ownerType='22_00018-202' + /> </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 +124,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> @@ -79,22 +136,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='读取卡证' @@ -103,31 +165,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> @@ -138,20 +207,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> @@ -162,43 +237,35 @@ let isLegal = type === '09_01001-2' return ( <> - <Col span={24}> - <FormItem - label={isLegal ? '企业登记材料' : '机构登记材料'} + <Col span={24} className="doubleFile"> + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&ownerId=${id}&ownerType=22_00018-203`, + }} field='file' - > - <Upload - drag - multiple - accept='image/*' - action='/' - onDrop={(e) => { - }} - tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' - /> - </FormItem> + label={isLegal ? '企业登记材料' : '机构登记材料'} + editData={props.editData} + handleDelFile={handleDelFile} + ownerType='22_00018-203' + /> </Col> - <Col span={24}> - <FormItem - label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'} + <Col span={24} className="doubleFile"> + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&ownerId=${id}&ownerType=22_00018-204`, + }} field='file1' - > - <Upload - drag - multiple - accept='image/*' - action='/' - onDrop={(e) => { - }} - tip='支持png、jpg、pdf格式的图片上传,每次上传大小不超过10M' - /> - </FormItem> + label={isLegal ? '法定代表人身份证明材料' : '机构代表人身份证明材料'} + editData={props.editData} + handleDelFile={handleDelFile} + ownerType='22_00018-204' + /> </Col> <Col span={12}> <FormItem - label={isLegal ? '企业名称' : '机构名称'} - 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='选择' @@ -208,41 +275,49 @@ </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={isLegal ? '企业所在地' : '机构所在地'} field='money'> + <FormItem label={isLegal ? '企业所在地' : '机构所在地'} field='addr'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> - <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='money'> + <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='orgaCode'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> - <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='money'> + <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='deputy'> <Input placeholder='请填写' /> </FormItem> </Col> <Col span={12}> <FormItem - label={ isLegal ? '企业类型' : '机构类型'} - field='minzu' + label={isLegal ? '企业类型' : '机构类型'} + 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> @@ -255,7 +330,24 @@ 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 + }, true) + } 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, + id: id + }, false) + } + props.onClose() + } }); } } @@ -267,7 +359,7 @@ return ( <div className="applyDialog"> - <div style={{ height: '590px', overflowY: 'scroll' }}> + <Scrollbars style={{ height: '590px' }} autoHide> <div className="dialogTitle">当事人类型</div> <Row gutter={[16, 16]} style={{ margin: '0 2px 0 0' }}> {$$.options.personClass.map((x, t) => { @@ -291,11 +383,12 @@ })} <Col span={24}> <Form - ref={props.formRef} + ref={formRef} layout='vertical' requiredSymbol={false} initialValues={{ }}//默认值 + scrollToFirstError > <Row gutter={[32, 0]} style={{ margin: '0 -10px' }}>{formType(perClass)}</Row> </Form> @@ -303,19 +396,33 @@ </Row> {/* 重复来访重点人员 */} - <div style={{ width: 'calc(100% - 9px)', background: '#f2f3f5', marginBottom: '20px', padding: '12px' }}> + {/* <div style={{ width: 'calc(100% - 9px)', background: '#f2f3f5', marginBottom: '20px', padding: '12px' }}> <KeyVisits /> - </div> - </div> + </div> */} + </Scrollbars> <div className='dialogFooter'> <Button type="primary" className="dialogPrimary" onClick={handleSave} > - 保存信息 + 保存 </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