diff --git a/src/pages/SitePerson/components/SitePersonModal.tsx b/src/pages/SitePerson/components/SitePersonModal.tsx index 39364bb..9d40bbc 100644 --- a/src/pages/SitePerson/components/SitePersonModal.tsx +++ b/src/pages/SitePerson/components/SitePersonModal.tsx @@ -1,15 +1,18 @@ import React, { useEffect, useState } from 'react'; -import { Form, Input, Modal, Spin, Button, Tooltip, Radio, RadioChangeEvent } from 'antd'; -import { getSessionUserData } from '@/utils/session'; +import { Form, Input, Modal, Spin, Select, Button, Radio, RadioChangeEvent } from 'antd'; +import ExtendUpload from "@/utils/ExtendUpload"; +import { getFileListByBid } from '@/utils/DownloadUtils'; interface SitePersonModalProps { title: any; modalVisible: boolean; + formDisabled: boolean; values: any; onSubmit: any; type: string; onCancel: () => void; + placeList: any[]; } const layout = { labelCol: { span: 7 }, @@ -17,12 +20,11 @@ const layout = { }; const SitePersonModal: React.FC = (props) => { const [form] = Form.useForm(); - const { title, modalVisible, type, values, onSubmit: handleUpdate, onCancel } = props; + // const weboffice = useRef(null); + const { title, modalVisible, formDisabled, type, values, onSubmit: handleUpdate, onCancel, placeList } = props; //loading const [loading, setLoading] = useState(false); - const organizationId = getSessionUserData().organizationId; - const organizationName = getSessionUserData().organizationName; - const [value, setValue] = useState("0"); + const [value, setValue] = useState("1"); const onChange = (e: RadioChangeEvent) => { console.log('radio checked', e.target.value); @@ -30,31 +32,15 @@ const SitePersonModal: React.FC = (props) => { }; - useEffect(() => { if (JSON.stringify(values) !== "{}") { - setValue(values.bankFlag); form.setFieldsValue({ "id": values.id, - "accountName": values.accountName, - "cardNumber": values.cardNumber, - "bank": values.bank, - "bankOutlets": values.bankOutlets, - "bankUnionNumber": values.bankUnionNumber, - "bankFlag": values.bankFlag, - "companyId": values.companyId, - "companyName": values.companyName, - "type": values.type, - "contactName": values.contactName, - "contactPhone": values.contactPhone, - "contactMail": values.contactMail, - }); - } else { - form.setFieldsValue({ - "accountName": organizationName, - "companyId": organizationId, - "companyName": organizationName, - "type": "0", + "evalPlaceId": {label: values.eroomName,value: values.evalPlaceId}, + "facePic": values.facePic, + "sex": values.sex, + "personName": values.personName, + "identityCard": values.identityCard }); } }, [values]) @@ -64,13 +50,14 @@ const SitePersonModal: React.FC = (props) => { const onOk = async () => { const fieldsValue = await form.validateFields(); setLoading(true) - let tzsState = { - state: "1" - } - if (form.getFieldValue('bankFlag') == "0") { - fieldsValue["bank"] = "中信银行" - } - await handleUpdate({ ...fieldsValue, ...tzsState }).finally(() => { + fieldsValue["evalPlaceId"] = fieldsValue.evalPlaceId.value + console.log(fieldsValue) + + await getFileListByBid(fieldsValue.facePic).then(res => { + fieldsValue["facePicName"] = res[0].name + }) + console.log(fieldsValue) + await handleUpdate({ ...fieldsValue }).finally(() => { setLoading(false) }); }; @@ -113,86 +100,76 @@ const SitePersonModal: React.FC = (props) => { - - -