From 73fc2bfa7bb20bf27c8077988468ad8f82140705 Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Mon, 30 Jun 2025 15:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=A2=83=E5=A4=96=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/register/register.less              |   3 +
 src/pages/register/supplier.tsx               |   2 +-
 .../register/supplier/CommonFormSections.tsx  |  45 +++--
 src/pages/register/supplier/DomesticForm.tsx  |  24 ++-
 src/pages/register/supplier/ForeignForm.tsx   | 188 +++++-------------
 5 files changed, 95 insertions(+), 167 deletions(-)

diff --git a/src/pages/register/register.less b/src/pages/register/register.less
index cc83ba1..18eaa11 100644
--- a/src/pages/register/register.less
+++ b/src/pages/register/register.less
@@ -112,4 +112,7 @@
   height: 75vh;
   overflow-x: hidden;
   overflow-y: auto;
+  .ant-form-item-label-fix{
+    padding-left: 30px !important;
+  }
 }
\ No newline at end of file
diff --git a/src/pages/register/supplier.tsx b/src/pages/register/supplier.tsx
index 8e11733..f1d1db7 100644
--- a/src/pages/register/supplier.tsx
+++ b/src/pages/register/supplier.tsx
@@ -181,7 +181,7 @@ const SupplierRegister: React.FC = () => {
             labelCol={{ span: 7 }}
             wrapperCol={{ span: 17 }}
           >
-            <Form.Item label="企业类型" labelCol={{ span: 2 }} wrapperCol={{ span: 19 }}>
+            <Form.Item label="身份类型" labelCol={{ span: 2 }} wrapperCol={{ span: 19 }}>
               <Radio.Group onChange={handleSupplierTypeChange} buttonStyle="solid" value={supplierType}>
                 <Radio.Button value="dvs">境内企业/机构</Radio.Button>
                 <Radio.Button value="ovs">境外企业</Radio.Button>
diff --git a/src/pages/register/supplier/CommonFormSections.tsx b/src/pages/register/supplier/CommonFormSections.tsx
index 481505f..39845d6 100644
--- a/src/pages/register/supplier/CommonFormSections.tsx
+++ b/src/pages/register/supplier/CommonFormSections.tsx
@@ -104,7 +104,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'certificateType']}
                       noStyle
-                      rules={[{ required: true, message: '请选择资质证书类型' }]}
+                      rules={[{ required: false, message: '请选择资质证书类型' }]}
                     >
                       <Select placeholder="请选择类型" style={{ width: '100%' }}>
                         <Option value="机构资质">机构资质</Option>
@@ -123,7 +123,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'name']}
                       noStyle
-                      rules={[{ required: true, message: '请输入资质名称' }]}
+                      rules={[{ required: false, message: '请输入资质名称' }]}
                     >
                       <Input placeholder="请输入资质名称" />
                     </Form.Item>
@@ -136,7 +136,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'code']}
                       noStyle
-                      rules={[{ required: true, message: '请输入资质证书编号' }]}
+                      rules={[{ required: false, message: '请输入资质证书编号' }]}
                     >
                       <Input placeholder="请输入证书编号" />
                     </Form.Item>
@@ -158,7 +158,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'authority']}
                       noStyle
-                      rules={[{ required: true, message: '请输入发证机构' }]}
+                      rules={[{ required: false, message: '请输入发证机构' }]}
                     >
                       <Input placeholder="请输入发证机构" />
                     </Form.Item>
@@ -171,7 +171,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'dateTime']}
                       noStyle
-                      rules={[{ required: true, message: '请选择发证日期' }]}
+                      rules={[{ required: false, message: '请选择发证日期' }]}
                     >
                       <DatePicker
                         placeholder="年/月/日"
@@ -188,7 +188,7 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'termOfValidity']}
                       noStyle
-                      rules={[{ required: true, message: '请选择资质有效期' }]}
+                      rules={[{ required: false, message: '请选择资质有效期' }]}
                     >
                       <DatePicker
                         placeholder="年/月/日"
@@ -205,8 +205,8 @@ export const QualificationSection: React.FC<CommonFormSectionsProps> = ({ form }
                     <Form.Item
                       name={[record.name, 'accessory']}
                       noStyle
-                                              rules={[{ required: true, message: '请上传资质证书附件' }]}
-                        valuePropName="value"
+                      rules={[{ required: false, message: '请上传资质证书附件' }]}
+                      valuePropName="value"
                     >
                       <FileUpload
                         maxSize={10}
@@ -306,7 +306,11 @@ export const InvoiceSection: React.FC<CommonFormSectionsProps> = ({ form }) => {
           </Form.Item>
         </Col>
         <Col span={8}>
-          <Form.Item name={['coscoSupplierInvoice', 'qualificationCertificate']} label="一般纳税人资格证明" valuePropName="value">
+          <Form.Item
+            name={['coscoSupplierInvoice', 'qualificationCertificate']}
+            label="一般纳税人资格证明"
+            valuePropName="value"
+          >
             <FileUpload
               maxSize={10}
               allowedTypes={['pdf', 'jpg', 'jpeg', 'png']}
@@ -450,7 +454,8 @@ export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form })
  */
 export const SurveySection: React.FC<SurveySectionProps> = ({ form, surveyQuestions }) => {
   // 使用API获取的问卷数据，如果没有则显示无数据状态
-  const hasQuestions = surveyQuestions && Array.isArray(surveyQuestions) && surveyQuestions.length > 0;
+  const hasQuestions =
+    surveyQuestions && Array.isArray(surveyQuestions) && surveyQuestions.length > 0;
 
   // 调试日志
   console.log('调查问卷数据:', surveyQuestions);
@@ -525,7 +530,13 @@ export const SurveySection: React.FC<SurveySectionProps> = ({ form, surveyQuesti
       </div>
 
       {hasQuestions ? (
-        <Form.List name="coscoSupplierSurveyQuestionReply" initialValue={surveyQuestions.map((q: any, index) => ({ surveyQuestionId: q.id, replyValue: '' }))}>
+        <Form.List
+          name="coscoSupplierSurveyQuestionReply"
+          initialValue={surveyQuestions.map((q: any, index) => ({
+            surveyQuestionId: q.id,
+            replyValue: '',
+          }))}
+        >
           {(fields, { add, remove }) => {
             console.log('Form.List fields:', fields);
 
@@ -567,13 +578,11 @@ export const SurveySection: React.FC<SurveySectionProps> = ({ form, surveyQuesti
                             rules={[{ required: true, message: `请选择问题${index + 1}的答案` }]}
                             wrapperCol={{ span: 24 }}
                           >
-                            {record.coscoSurveyQuestionOptionList && record.coscoSurveyQuestionOptionList.length > 0 ? (
+                            {record.coscoSurveyQuestionOptionList &&
+                            record.coscoSurveyQuestionOptionList.length > 0 ? (
                               <Radio.Group>
                                 {record.coscoSurveyQuestionOptionList.map((option: any) => (
-                                  <Radio
-                                    key={option.id}
-                                    value={option.opentionValue}
-                                  >
+                                  <Radio key={option.id} value={option.opentionValue}>
                                     {option.optionName}
                                   </Radio>
                                 ))}
@@ -584,7 +593,7 @@ export const SurveySection: React.FC<SurveySectionProps> = ({ form, surveyQuesti
                           </Form.Item>
                         </>
                       );
-                    }
+                    },
                   },
                 ]}
               />
@@ -712,7 +721,7 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
                     )}
 
                     {index > 0 && (
-                                              <Form.Item name={[field.name, 'fileUrl']} valuePropName="value">
+                      <Form.Item name={[field.name, 'fileUrl']} valuePropName="value">
                         <FileUpload
                           maxSize={20}
                           allowedTypes={['*']}
diff --git a/src/pages/register/supplier/DomesticForm.tsx b/src/pages/register/supplier/DomesticForm.tsx
index f21aab6..4ba936e 100644
--- a/src/pages/register/supplier/DomesticForm.tsx
+++ b/src/pages/register/supplier/DomesticForm.tsx
@@ -44,11 +44,25 @@ const DomesticForm: React.FC<DomesticFormProps> = ({
 
       {/* 营业执照附件和有效期 */}
       <Row gutter={24}>
+        <Col span={8}>
+          <Form.Item
+            name={['coscoSupplierBase', 'enterpriseType']}
+            label="企业类型"
+            rules={[{ required: true, message: '请选择企业类型' }]}
+            valuePropName="value"
+          >
+            <Select placeholder="请选择企业类型">
+              <Option value="limited">有限责任公司</Option>
+              <Option value="joint">股份有限公司</Option>
+              <Option value="individual">个体工商户</Option>
+              <Option value="other">其他</Option>
+            </Select>
+          </Form.Item>
+        </Col>
         <Col span={8}>
           <Form.Item
             name={['coscoSupplierBase', 'licenceAccessory']}
             label="营业执照附件"
-            // extra="pdf,jpg,jpeg,png类型的文件,大小不超过10MB"
             rules={[{ required: true, message: '请上传营业执照附件' }]}
             valuePropName="value"
           >
@@ -100,7 +114,7 @@ const DomesticForm: React.FC<DomesticFormProps> = ({
             <Input placeholder="请输入正确的统一社会信用代码" />
           </Form.Item>
         </Col>
-        <Col span={24}>
+        <Col span={24} className="ant-form-item-label-fix">
           <Form.Item
             name={['coscoSupplierBase', 'range']}
             label="经营范围"
@@ -117,7 +131,7 @@ const DomesticForm: React.FC<DomesticFormProps> = ({
             />
           </Form.Item>
         </Col>
-        <Col span={24}>
+        <Col span={24} className="ant-form-item-label-fix">
           <Form.Item
             labelCol={{ span: 2 }}
             wrapperCol={{ span: 22 }}
@@ -128,7 +142,7 @@ const DomesticForm: React.FC<DomesticFormProps> = ({
             <Input prefix={<EnvironmentOutlined />} placeholder="上海市普陀区XX路1888号" />
           </Form.Item>
         </Col>
-        <Col span={24}>
+        <Col span={24} className="ant-form-item-label-fix">
           <Form.Item
             name={['coscoSupplierBase', 'workAddress']}
             label="办公地址"
@@ -141,7 +155,7 @@ const DomesticForm: React.FC<DomesticFormProps> = ({
             />
           </Form.Item>
         </Col>
-        <Col span={24}>
+        <Col span={24} className="ant-form-item-label-fix">
           <Form.Item
             name={['coscoSupplierBase', 'parentCompanyInvestor']}
             label="母公司/出资人"
diff --git a/src/pages/register/supplier/ForeignForm.tsx b/src/pages/register/supplier/ForeignForm.tsx
index 0f06258..50b05ea 100644
--- a/src/pages/register/supplier/ForeignForm.tsx
+++ b/src/pages/register/supplier/ForeignForm.tsx
@@ -1,11 +1,7 @@
 /* 境外企业 表单项 */
 import React from 'react';
 import { Form, Input, Button, Select, Row, Col } from 'antd';
-import {
-  MobileOutlined,
-  MailOutlined,
-  EnvironmentOutlined,
-} from '@ant-design/icons';
+import { MobileOutlined, MailOutlined, EnvironmentOutlined } from '@ant-design/icons';
 /**
  * 引入通用表单组件
  */
@@ -32,7 +28,12 @@ interface ForeignFormProps {
  * 基本信息部分为境外企业特有
  * 其他部分使用通用表单组件
  */
-const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCaptcha, surveyQuestions }) => {
+const ForeignForm: React.FC<ForeignFormProps> = ({
+  form,
+  countdown,
+  handleGetCaptcha,
+  surveyQuestions,
+}) => {
   return (
     <>
       {/* 境外企业特有的基本信息部分 */}
@@ -43,7 +44,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           <Form.Item
             name={['coscoSupplierBase', 'name']}
             label="企业名称"
-            rules={[{ required: true, message: '请输入企业名称' }]}
+            rules={[{ required: false, message: '请输入企业名称' }]}
           >
             <Input placeholder="请输入企业名称" />
           </Form.Item>
@@ -57,15 +58,6 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
             <Input placeholder="请输入企业英文名称" />
           </Form.Item>
         </Col>
-        <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'socialCreditCode']}
-            label="公司注册号"
-            rules={[{ required: true, message: '请输入公司注册号' }]}
-          >
-            <Input placeholder="请输入公司注册号" />
-          </Form.Item>
-        </Col>
         <Col span={8}>
           <Form.Item
             name="country"
@@ -88,51 +80,32 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
         </Col>
         <Col span={8}>
           <Form.Item
-            name="registrationPassword"
-            label="登录密码"
-            rules={[
-              { required: true, message: '请输入登录密码' },
-              { min: 8, message: '密码长度为8-20位' },
-              {
-                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*])[A-Za-z\d!@#$%^&*]{8,20}$/,
-                message: '需要同时包含字母、数字、大小写',
-              },
-            ]}
+            name={['coscoSupplierBase', 'vat']}
+            label="税号"
+            rules={[{ required: false, message: '请输入税号' }]}
           >
-            <Input.Password placeholder="长度为8-20位，需要同时包含字母、数字、大小写" />
+            <Input placeholder="请输入税号" />
           </Form.Item>
         </Col>
-        <Col span={8}>
+        <Col span={24} className="ant-form-item-label-fix">
           <Form.Item
-            name="confirmPassword"
-            label="确认密码"
-            rules={[
-              { required: true, message: '请再次输入密码' },
-              ({ getFieldValue }) => ({
-                validator(_, value) {
-                  if (!value || getFieldValue('registrationPassword') === value) {
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(new Error('两次输入的密码不一致'));
-                },
-              }),
-            ]}
-          >
-            <Input.Password placeholder="请再次输入密码" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'regAddress']}
-            label="注册地址"
-            rules={[{ required: true, message: '请输入注册地址' }]}
+            name={['coscoSupplierBase', 'workAddress']}
+            label="办公地址"
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 22 }}
           >
             <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
           </Form.Item>
         </Col>
-        <Col span={8}>
-          <Form.Item name={['coscoSupplierBase', 'workAddress']} label="办公地址">
-            <Input prefix={<EnvironmentOutlined />} placeholder="请具体注明" />
+        <Col span={24} className="ant-form-item-label-fix">
+          <Form.Item
+            name={['coscoSupplierBase', 'range']}
+            label="经营范围"
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 22 }}
+            rules={[{ required: true, message: '请输入经营范围' }]}
+          >
+            <TextArea placeholder="请输入经营范围" rows={2} maxLength={200} showCount />
           </Form.Item>
         </Col>
         <Col span={8}>
@@ -144,48 +117,15 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
           <Form.Item
             name={['coscoSupplierBase', 'legalPerson']}
             label="企业法定代表人"
-            rules={[{ required: true, message: '请输入企业法定代表人' }]}
+            rules={[{ required: false, message: '请输入企业法定代表人' }]}
           >
             <Input placeholder="请输入企业法定代表人" />
           </Form.Item>
         </Col>
         <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'enterpriseType']}
-            label="企业性质"
-            rules={[{ required: true, message: '请选择企业性质' }]}
-          >
-            <Select placeholder="请选择企业性质">
-              <Option value="corporation">公司制企业</Option>
-              <Option value="partnership">合伙企业</Option>
-              <Option value="joint">合资企业</Option>
-              <Option value="sole">独资企业</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'supplierType']}
-            label="供应商类型"
-            rules={[{ required: true, message: '请选择供应商类型' }]}
-          >
-            <Select placeholder="请选择供应商类型">
-              <Option value="manufacturer">制造商</Option>
-              <Option value="agent">代理商</Option>
-              <Option value="service">服务商</Option>
-              <Option value="other">其他</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            label="注册资本"
-            required
-            style={{ marginBottom: 0 }}
-          >
+          <Form.Item label="注册资本" required style={{ marginBottom: 0 }}>
             <Input.Group compact style={{ display: 'flex' }}>
-              <Form.Item name="capitalCurrency" noStyle initialValue="USD">
+              <Form.Item name="currency" noStyle initialValue="USD">
                 <Select style={{ width: 100, borderRadius: '2px 0 0 2px' }}>
                   <Option value="USD">美元</Option>
                   <Option value="EUR">欧元</Option>
@@ -197,7 +137,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
               <Form.Item
                 name={['coscoSupplierBase', 'capital']}
                 noStyle
-                rules={[{ required: true, message: '请输入注册资本金额' }]}
+                rules={[{ required: false, message: '请输入注册资本金额' }]}
               >
                 <Input
                   type="number"
@@ -208,17 +148,6 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
             </Input.Group>
           </Form.Item>
         </Col>
-        <Col span={24}>
-          <Form.Item
-            name={['coscoSupplierBase', 'range']}
-            label="经营范围"
-            labelCol={{ span: 2 }}
-            wrapperCol={{ span: 22 }}
-            rules={[{ required: true, message: '请输入经营范围' }]}
-          >
-            <TextArea placeholder="请输入经营范围" rows={2} maxLength={200} showCount />
-          </Form.Item>
-        </Col>
         <Col span={8}>
           <Form.Item
             name={['coscoSupplierBase', 'contactsName']}
@@ -230,17 +159,15 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
         </Col>
         <Col span={8}>
           <Form.Item
-            name={['coscoSupplierBase', 'contactsPhone']}
-            label="联系人手机"
+            name={['coscoSupplierBase', 'contactsEmail']}
+            label="联系人邮箱"
             rules={[
-              { required: true, message: '请输入联系人手机号码' },
-              { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' },
+              { type: 'email', message: '请输入有效的电子邮箱' },
+              { required: true, message: '请输入电子邮箱' },
             ]}
+
           >
-            <Input
-              placeholder="请输入11位手机号码"
-              prefix={<MobileOutlined />}
-              addonAfter={
+            <Input prefix={<MailOutlined />} placeholder="XXX@XXX.com" addonAfter={
                 <Button
                   type="link"
                   size="small"
@@ -249,8 +176,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
                 >
                   {countdown ? `${countdown}秒后重新获取` : '获取验证码'}
                 </Button>
-              }
-            />
+              } />
           </Form.Item>
         </Col>
         <Col span={8}>
@@ -261,47 +187,23 @@ const ForeignForm: React.FC<ForeignFormProps> = ({ form, countdown, handleGetCap
               { required: true, message: '请输入验证码' },
               { pattern: /^\d{6}$/, message: '请输入6位数字验证码' },
             ]}
-            extra="该手机号用于后续联系和找回密码"
+            extra="该邮箱用于后续联系和找回密码"
           >
             <Input placeholder="请输入验证码" />
           </Form.Item>
         </Col>
         <Col span={8}>
           <Form.Item
-            name={['coscoSupplierBase', 'contactsType']}
-            label="联系人身份类别"
-            rules={[{ required: true, message: '请选择联系人身份类别' }]}
-          >
-            <Select placeholder="请选择类型">
-              <Option value="internal">境内人士</Option>
-              <Option value="external">境外（非大陆人士）</Option>
-            </Select>
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'idCard']}
-            label="联系人证件号码"
-            rules={[{ required: true, message: '请输入联系人证件号码' }]}
-          >
-            <Input placeholder="请填写联系人正确的身份证号" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item
-            name={['coscoSupplierBase', 'contactsEmail']}
-            label="联系人邮箱"
+            name={['coscoSupplierBase', 'contactsPhone']}
+            label="联系电话"
             rules={[
-              { type: 'email', message: '请输入有效的电子邮箱' },
-              { required: true, message: '请输入电子邮箱' },
+              { required: false, message: '请输入联系电话' }
             ]}
           >
-            <Input prefix={<MailOutlined />} placeholder="XXX@XXX.com" />
-          </Form.Item>
-        </Col>
-        <Col span={8}>
-          <Form.Item name={['coscoSupplierBase', 'telephone']} label="固定电话">
-            <Input placeholder="请输入企业联系电话" />
+            <Input
+              placeholder="请输入联系电话"
+              prefix={<MobileOutlined />}
+            />
           </Form.Item>
         </Col>
       </Row>