From 56fc5b2f872cd84c735d4b2a4ad32db15daf5e57 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sun, 24 Apr 2022 20:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=98=E6=9B=B4=E3=80=91=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=BC=B4=E8=B4=B9=E3=80=81=E8=AF=81=E4=B9=A6=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=20=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E6=89=93=E5=8C=85=E4=BC=9A=E5=91=98=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BF=A1=E6=81=AF=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CertificateManagement.vue                 |   1 +
 .../PaymentInfo/modules/PaymentInfoModal.vue  |  85 +++
 .../VinCertificateModal.vue                   | 519 +++++++++---------
 3 files changed, 343 insertions(+), 262 deletions(-)

diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index cfb209f..580fcfd 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -446,6 +446,7 @@ export default {
       console.log(record)
       record.certificateModality = Number(record.certificateModality)
       record.certificateStatus = Number(record.certificateStatus)
+      // 证书是否免费  1-免费 2-付费
       record.chargeType = Number(record.chargeType)
       // 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书
       this.$refs.modalForm.title = ''
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 9ff1ec2..a4a9ae9 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -194,6 +194,91 @@
               </a-form-item>
             </a-col>
           </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag
+                  :disabled="checkFlag||detailFlag"
+                  @change="invoiceRequirementsChange"
+                  type="list"
+                  v-decorator="['invoiceRequirements',{ rules: validatorRules.invoiceRequirements.rules, initialValue:2,validateTrigger: 'change'},]"
+                  :trigger-change="true"
+                  dictCode="invoice_requirements"
+                  placeholder="请选择发票" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <template v-if="invoiceRequirementsFlag">
+            <a-row>
+              <a-col :span="12">
+                <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    v-decorator="['headerName',{ rules: validatorRules.headerName.rules, initialValue:headerName,validateTrigger: 'blur',},]"
+                    :trigger-change="true"
+                    @change="event => event.target.value = event.target.value.trim()"
+                    placeholder="请输入关联付款发票名称"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['taxNumber',{ rules: validatorRules.taxNumber.rules, validateTrigger: 'blur',initialValue:taxNumber},]"
+                    placeholder="请输入社会统一代码/税号"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', initialValue:invoiceInfoObj.invoiceAddress}]"
+                    placeholder="请输入单位地址"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    v-decorator="['invoicePhone',{ rules: validatorRules.invoicePhone.rules, initialValue: invoiceInfoObj.invoicePhone,validateTrigger: 'blur'}]"
+                    :trigger-change="true"
+                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+                    placeholder="请输入电话号码"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.depositBank}]"
+                    placeholder="请输入开户银行"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :disabled="checkFlag||detailFlag"
+                    @change="(e) => {e.target.value = e.target.value.trim()}"
+                    v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.bankAccount}]"
+                    placeholder="请输入银行账户"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </template>
           <a-row>
             <a-col :span="24" class="remark">
               <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
index d48c999..e9f816e 100644
--- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
+++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
@@ -186,7 +186,7 @@
         </template>
         <a-form :form="form">
           <a-divider orientation="left">
-            缴费信息
+            缴费信息---------2
           </a-divider>
           <a-row>
             <a-col :span="12">
@@ -869,7 +869,7 @@
             </a-col>
           </a-row>
           <a-divider orientation="left">
-            缴费信息
+            缴费信息--------3
           </a-divider>
           <a-row>
             <a-col :span="12">
@@ -913,7 +913,8 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <div style="height:150px" v-if="isWireTransfer === '2' ">
+          <!--  缴费方式--打包会员 -->
+          <div v-if="isWireTransfer === '2' ">
             <a-row>
               <a-col :span="12">
                 <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -925,6 +926,20 @@
                     style="width: 100%" />
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag
+                    type="list"
+                    v-model="memberInfoPayment.invoiceRequirements"
+                    v-decorator="['invoiceRequirements',validatorRules.invoiceRequirements]"
+                    @change="invoiceRequirementsChange"
+                    :trigger-change="true"
+                    dictCode="invoice_requirements"
+                    placeholder="请选择发票" />
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row>
               <a-col :span="12">
                 <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-upload
@@ -941,7 +956,9 @@
 
               </a-col>
             </a-row>
+
           </div>
+          <!--  缴费方式--电汇 -->
           <div v-if="isWireTransfer === '1' ">
             <a-row>
               <a-col :span="12">
@@ -992,71 +1009,9 @@
                 </a-form-item>
               </a-col>
             </a-row>
-            <!--发票信息的显示-->
-            <template v-if="invoiceRequirementsFlag">
-              <a-row>
-                <a-col :span="12">
-                  <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
-                      placeholder="请输入关联付款发票名称"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
-                      placeholder="请输入社会统一代码/税号"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
-                      placeholder="请输入单位地址"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
-                      :trigger-change="true"
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
-                      placeholder="请输入电话号码"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
-                      placeholder="请输入开户银行"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
-                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
-                      placeholder="请输入银行账户"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </template>
 
           </div>
+          <!--  缴费方式--现金 -->
           <div v-if="isWireTransfer === '3' ">
             <a-row>
               <a-col :span="12">
@@ -1095,69 +1050,71 @@
                 </a-form-item>
               </a-col>
             </a-row>
-            <template v-if="invoiceRequirementsFlag">
-              <a-row>
-                <a-col :span="12">
-                  <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
-                      placeholder="请输入关联付款发票名称"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
-                      placeholder="请输入社会统一代码/税号"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
-                      placeholder="请输入单位地址"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
-                      :trigger-change="true"
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
-                      placeholder="请输入电话号码"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
-                      placeholder="请输入开户银行"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
-                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
-                      placeholder="请输入银行账户"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </template>
+
           </div>
+          <!--发票信息的显示-->
+          <template v-if="invoiceRequirementsFlag">
+            <a-row>
+              <a-col :span="12">
+                <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :maxLength="50"
+                    v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
+                    placeholder="请输入关联付款发票名称"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :maxLength="50"
+                    v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
+                    placeholder="请输入社会统一代码/税号"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
+                    placeholder="请输入单位地址"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
+                    :trigger-change="true"
+                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+                    placeholder="请输入电话号码"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
+                    placeholder="请输入开户银行"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                    v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
+                    placeholder="请输入银行账户"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </template>
         </a-form>
       </a-spin>
     </template>
@@ -1253,7 +1210,7 @@
           </a-row>
 
           <a-divider orientation="left">
-            缴费信息
+            缴费信息--------4
           </a-divider>
           <a-row>
             <a-col :span="12">
@@ -1707,7 +1664,7 @@
             </a-row>
 
             <a-divider orientation="left">
-              缴费信息
+              缴费信息---------5
             </a-divider>
             <a-row>
               <a-col :span="12">
@@ -2074,7 +2031,7 @@
             </a-col>
           </a-row>
           <a-divider orientation="left">
-            缴费信息
+            缴费信息----------6
           </a-divider>
           <a-row>
             <a-col :span="12">
@@ -2117,7 +2074,7 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <!--          打包会员-->
+          <!--   缴费方式--打包会员-->
           <div v-if="isWireTransfer === '2'">
             <a-row>
               <a-col :span="12">
@@ -2130,6 +2087,19 @@
                     style="width: 100%" />
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag
+                    type="list"
+                    v-decorator="['invoiceRequirements',{...validatorRules.invoiceRequirements, initialValue:currentMemberInfo.invoiceRequirements}]"
+                    @change="invoiceRequirementsChange"
+                    :trigger-change="true"
+                    dictCode="invoice_requirements"
+                    placeholder="请选择发票" />
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row>
               <a-col :span="12">
                 <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-upload
@@ -2146,7 +2116,7 @@
               </a-col>
             </a-row>
           </div>
-          <!--电汇-->
+          <!-- 缴费方式--电汇-->
           <div v-if="isWireTransfer === '1'">
             <a-row>
               <a-col :span="12">
@@ -2197,70 +2167,9 @@
                 </a-form-item>
               </a-col>
             </a-row>
-            <template v-if="invoiceRequirementsFlag">
-              <a-row>
-                <a-col :span="12">
-                  <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
-                      placeholder="请输入关联付款发票名称"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
-                      placeholder="请输入社会统一代码/税号"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
-                      placeholder="请输入单位地址"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
-                      :trigger-change="true"
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
-                      placeholder="请输入电话号码"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
-                      placeholder="请输入开户银行"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
-                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
-                      placeholder="请输入银行账户"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </template>
+
           </div>
-          <!--现金-->
+          <!--缴费方式--现金-->
           <div v-if="isWireTransfer === '3' ">
             <a-row>
               <a-col :span="12">
@@ -2300,69 +2209,70 @@
                 </a-form-item>
               </a-col>
             </a-row>
-            <template v-if="invoiceRequirementsFlag">
-              <a-row>
-                <a-col :span="12">
-                  <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
-                      placeholder="请输入关联付款发票名称"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      :maxLength="50"
-                      v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
-                      placeholder="请输入社会统一代码/税号"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
-                      placeholder="请输入单位地址"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
-                      :trigger-change="true"
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
-                      placeholder="请输入电话号码"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-              <a-row v-if="currentSelectInvoiceType === 2">
-                <a-col :span="12">
-                  <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
-                      placeholder="请输入开户银行"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
-                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
-                      placeholder="请输入银行账户"
-                      :maxLength="50"></a-input>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </template>
           </div>
+          <!--发票信息的显示-->
+          <template v-if="invoiceRequirementsFlag">
+            <a-row>
+              <a-col :span="12">
+                <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :maxLength="50"
+                    v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:memberInfoPayment.invoiceInfo}]"
+                    placeholder="请输入关联付款发票名称"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    :maxLength="50"
+                    v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: memberInfoPayment.taxNo}]"
+                    placeholder="请输入社会统一代码/税号"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:memberInfoPayment.invoiceAddress}]"
+                    placeholder="请输入单位地址"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: memberInfoPayment.invoicePhone}]"
+                    :trigger-change="true"
+                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+                    placeholder="请输入电话号码"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row v-if="currentSelectInvoiceType === 2">
+              <a-col :span="12">
+                <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="event => event.target.value = event.target.value.trim()"
+                    v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:memberInfoPayment.depositBank}]"
+                    placeholder="请输入开户银行"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
+                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                    v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:memberInfoPayment.bankAccount}]"
+                    placeholder="请输入银行账户"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </template>
         </a-form>
       </a-spin>
     </template>
@@ -2455,7 +2365,7 @@
           </a-row>
 
           <a-divider orientation="left">
-            缴费信息
+            缴费信息 --------7
           </a-divider>
           <a-row>
             <a-col :span="12">
@@ -2530,7 +2440,82 @@
                   <span style="color: #bfbfbf">请上传pdf文件</span>
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-dict-select-tag
+                    type="list"
+                    v-model="memberInfoPayment.invoiceRequirements"
+                    v-decorator="['invoiceRequirements',validatorRules.invoiceRequirements]"
+                    @change="invoiceRequirementsChange"
+                    :trigger-change="true"
+                    dictCode="invoice_requirements"
+                    placeholder="请选择发票" />
+                </a-form-item>
+              </a-col>
             </a-row>
+            <template v-if="invoiceRequirementsFlag">
+              <a-row>
+                <a-col :span="12">
+                  <a-form-item label="关联付款发票名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      :maxLength="50"
+                      v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
+                      placeholder="请输入关联付款发票名称"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      :maxLength="50"
+                      v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
+                      placeholder="请输入社会统一代码/税号"></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+
+              <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
+              <a-row v-if="currentSelectInvoiceType === 2">
+                <a-col :span="12">
+                  <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="event => event.target.value = event.target.value.trim()"
+                      v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
+                      placeholder="请输入单位地址"
+                      :maxLength="50"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      v-decorator="['invoicePhone',{ ...validatorRules.invoiceAddress, initialValue: currentMemberInfo.invoicePhone}]"
+                      :trigger-change="true"
+                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
+                      placeholder="请输入电话号码"
+                      :maxLength="50"></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+              <a-row v-if="currentSelectInvoiceType === 2">
+                <a-col :span="12">
+                  <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="event => event.target.value = event.target.value.trim()"
+                      v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
+                      placeholder="请输入开户银行"
+                      :maxLength="50"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
+                      placeholder="请输入银行账户"
+                      :maxLength="50"></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </template>
           </div>
 
           <div v-if="paymentMethodFlag == false">
@@ -3641,11 +3626,13 @@ export default {
         if (res.success) {
           this.memberInfoPayment = res.result
           this.isWireTransfer = this.memberInfoPayment.paymentMethod + ''
+          this.changePaymentMethod(this.isWireTransfer)
           // 对发票的显示 进行操作
           this.invoiceRequirementsChange(res.result.invoiceRequirements)
-          this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.memberInfoPayment, 'submissionTime', 'paymentAmount', 'certificateType', 'headerName', 'invoiceRequirements', 'paymentMethod', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'paymentRecord', 'id', 'auditOpinion', 'address', 'postcode', 'mobile', 'liaisonMan', 'certificateValidDate', 'companyName', 'certificationDate', 'applyDate', 'effectDate', 'invalidDate', 'reasonsRenewal', 'certificateStatus', 'memberId', 'code', 'chargeType'))
-          })
+          setTimeout(() => {
+            this.form.setFieldsValue(pick(this.memberInfoPayment, 'submissionTime', 'paymentAmount', 'certificateType', 'headerName', 'invoiceRequirements', 'paymentMethod', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'paymentRecord', 'id', 'auditOpinion', 'address', 'postcode', 'mobile', 'liaisonMan', 'certificateValidDate', 'companyName', 'certificationDate', 'applyDate', 'effectDate', 'invalidDate', 'reasonsRenewal', 'certificateStatus', 'memberId', 'code', 'chargeType'))}, 1)
+
+          console.log('this.vinCertificate-------', this.vinCertificate)
         } else {
           console.log(res.message)
         }
@@ -4567,6 +4554,14 @@ export default {
       // 1 是电汇 2 打包 3 是现金
       this.isWireTransfer = value
       this.form.resetFields(['paymentType', 'paymentAmount', 'paymentTime', 'submissionTime', 'paymentRecord'])
+      // 默认显示增值税发票
+      let defaultInvoiceRequirements = 2
+      this.$nextTick(() => {
+        this.form.setFieldsValue({
+          'invoiceRequirements': defaultInvoiceRequirements
+        })
+        this.invoiceRequirementsChange(defaultInvoiceRequirements)
+      })
       if (value !== '1') {
         this.paymentMethodFlag = true
       } else {