From 552853dc3cd7864d70783153a8bcf2cc8909edd2 Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Mon, 02 Sep 2024 20:01:27 +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 | 122 ++++++++++++++++++++++++---------------- 1 files changed, 73 insertions(+), 49 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx index 757f2ef..4e4be9f 100644 --- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx +++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx @@ -15,19 +15,24 @@ 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'; +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' }); +} 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) { @@ -36,9 +41,19 @@ ...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) { @@ -51,6 +66,19 @@ } } + //上传身份证识别 + 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 formType = (type) => { if (type === '09_01001-1') { @@ -58,23 +86,15 @@ 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} + /> </Col> <Col span={12}> <FormItem @@ -202,36 +222,24 @@ 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} + /> </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} + /> </Col> <Col span={12}> <FormItem @@ -304,18 +312,20 @@ formRef.current.validate(undefined, (errors, values) => { if (!errors) { const fieldValue = formRef.current.getFields() + console.log(fieldValue); 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 - }) + perClassName: $$.options.personClass.find(item => item.value === perClass).label, + id: id + }, false) } props.onClose() } @@ -379,7 +389,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