From d3eefcaf3762ca97483e1517697b6941bd9a58d8 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 28 Aug 2024 09:51:50 +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 |   59 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
index 582ff74..3d31adb 100644
--- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, Fragment } from "react";
-import * as $$ from '../../../../utils/utility';
+import * as $$ from '@/utils/utility';
 import { Row, Col, Space } from 'antd';
 import {
   CheckOutlined,
@@ -11,7 +11,7 @@
   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 SelectUnitDialog from "./selectUnitDialog";
@@ -28,7 +28,16 @@
   const formRef = useRef();
   const [perClass, setPerClass] = useState('09_01001-1');
   const [visible, setVisible] = useState(false);
-  
+
+  useEffect(() => {
+    if (props.editData) {
+      //编辑
+      formRef.current.setFieldsValue({
+        ...props.editData
+      })
+    }
+  }, [])
+
 
   const personIconType = (v) => {
     switch (v) {
@@ -69,7 +78,7 @@
           <Col span={12}>
             <FormItem
               label={(<div style={{ display: 'flex' }}>姓名<div className="must">必填</div></div>)}
-              field='name'
+              field='trueName'
               rules={[{ required: true, message: '请输入姓名' }]}
             >
               <Input placeholder='请填写' />
@@ -78,8 +87,11 @@
           <Col span={12}>
             <FormItem
               label={(<div style={{ display: 'flex' }}>联系方式<div className="must">必填</div></div>)}
-              field='phone'
-              rules={[{ required: true, message: '请输入联系方式' }]}
+              field='personNumber'
+              rules={[
+                { required: true, message: '请输入联系方式' },
+                { match: /^\+?(\d{1,3})?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})$/, message: '请输入正确的电话号码' },
+              ]}
             >
               <Input placeholder='请填写' />
             </FormItem>
@@ -102,8 +114,11 @@
           <Col span={12}>
             <FormItem
               label={(<div style={{ display: 'flex' }}>证件号码<div className="must">必填</div></div>)}
-              rules={[{ required: true, message: '请输入证件号码' }]}
-              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='mobile'
             >
               <InputSearch
                 searchButton='读取卡证'
@@ -207,7 +222,7 @@
             <FormItem
               label={isLegal ? '企业名称' : '机构名称'}
               rules={[{ required: true }]}
-              field='peopleNumber'
+              field='trueName'
             >
               <InputSearch
                 searchButton='选择'
@@ -217,7 +232,7 @@
             </FormItem>
           </Col>
           <Col span={12}>
-            <FormItem label='联系方式' field='money'>
+            <FormItem label='联系方式' field='phoneNumber'>
               <Input placeholder='请填写' />
             </FormItem>
           </Col>
@@ -227,12 +242,12 @@
             </FormItem>
           </Col>
           <Col span={12}>
-            <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='money'>
+            <FormItem label={isLegal ? '统一社会信用代码' : '组织机构代码'} field='mobile'>
               <Input placeholder='请填写' />
             </FormItem>
           </Col>
           <Col span={12}>
-            <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='money'>
+            <FormItem label={isLegal ? '法定代表人' : '机构代表人'} field='companyName'>
               <Input placeholder='请填写' />
             </FormItem>
           </Col>
@@ -264,7 +279,22 @@
   const handleSave = () => {
     if (formRef.current) {
       formRef.current.validate(undefined, (errors, values) => {
-        console.log(errors, values);
+        if (!errors) {
+          if (props.editData) {
+            props.handleAddParty({
+              ...props.editData,
+              ...values
+            })
+          } else {
+            props.handleAddParty({
+              ...values,
+              partyType: props.dialogType,
+              perClass: perClass,
+              perClassName: props.dialogType === 0 ? '申请方当事人' : '被申请方当事人'
+            })
+          }
+          props.onClose()
+        }
       });
     }
   }
@@ -305,6 +335,7 @@
               requiredSymbol={false}
               initialValues={{
               }}//默认值
+              scrollToFirstError
             >
               <Row gutter={[32, 0]} style={{ margin: '0 -10px' }}>{formType(perClass)}</Row>
             </Form>
@@ -322,7 +353,7 @@
           className="dialogPrimary"
           onClick={handleSave}
         >
-          保存信息
+          保存
         </Button>
         <Button className="dialogBack">
           重置

--
Gitblit v1.8.0