From 3c8671b7ae66d585b9b5d1f7da0875629e8d280e Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Fri, 1 Apr 2022 14:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5bug?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaymentInfo/modules/PaymentInfoModal.vue        |  6 +++---
 .../memberManagementModule/VinCertificateModal.vue  | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index f783bce..9ff1ec2 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -431,7 +431,7 @@
                         placeholder="请选择生效日期"
                         v-decorator="['certificateArr['+ index + '].effectDate', {
                           rules: [
-                            { required: record.certificate_code, validator: checkEffectDate},
+                            { required: record.certificate_code && (!(checkFlag||detailFlag)), validator: checkEffectDate},
                           ],
                           validateTrigger: 'change',
                         }]"
@@ -447,7 +447,7 @@
                         placeholder="请选择失效日期"
                         v-decorator="['certificateArr['+ index + '].invalidDate', {
                           rules: [
-                            { required: record.certificate_code, validator: checkInvalidDate},
+                            { required: record.certificate_code && (!(checkFlag||detailFlag)), validator: checkInvalidDate},
                           ],
                           validateTrigger: 'change',
                         }]"
@@ -466,7 +466,7 @@
                         bizPath="payment"
                         v-decorator="['certificateArr['+ index + '].certificateImg',  {
                           rules: [
-                            { required: record.certificate_code, validator: checkCertificateImg},
+                            { required: record.certificate_code && (!(checkFlag||detailFlag)), validator: checkCertificateImg},
                           ],
                           validateTrigger: 'change',
                         }]">
diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
index 20adc35..d3c9d9a 100644
--- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
+++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
@@ -74,7 +74,7 @@
 
           <a-row v-if="model.code">
             <a-col :span="7">
-              <a-form-item label=" 证书文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label=" 证书附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-image-upload
                   isLessThan5M
                   disabled
@@ -839,7 +839,7 @@
             </a-col>
             <!--  输入证书代码显示上传 并为必填 -->
             <a-col :span="12" v-if="freeCertificate.code">
-              <a-form-item label="证书文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="证书附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-image-upload
                   isLessThan5M
                   isMultiple
@@ -3204,7 +3204,7 @@ export default {
         },
         certificateImg: {
           rules: [
-            { required: true, message: '请上传证书文件!' },
+            { required: true, message: '请上传证书附件!' },
 
           ],
           validateTrigger: 'change'
@@ -3694,11 +3694,14 @@ export default {
       this.freeCertificate = {}
       // 缴费信息置空
       this.memberInfoPayment = {}
-      this.model = Object.assign({}, this.currentMemberInfo)
+      // 默认选择增值税发票
+      let defaultInvoiceRequirements = 2
+      this.model = Object.assign({}, this.currentMemberInfo, {invoiceRequirements: defaultInvoiceRequirements})
       // console.log(this.model, '**********')
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'address', 'postcode', 'companyName', 'liaisonMan', 'mobile'))
+        this.form.setFieldsValue(pick(this.model, 'address', 'postcode', 'companyName', 'liaisonMan', 'mobile', 'invoiceRequirements'))
+        this.invoiceRequirementsChange(defaultInvoiceRequirements)
       })
     },