From 9e0f3c92043dd8010fea71c81b12d64413634ce4 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 27 Jul 2023 20:30:46 +0800
Subject: [PATCH] =?UTF-8?q?[update]-=E8=AF=81=E4=B9=A6=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E6=A8=A1=E6=80=81=E6=A1=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/standardsAssociation/BasicInfo.vue  |   2 +-
 .../modules/CertificatePaymentInfoModal.vue   | 274 +++++-----
 .../PaymentInfo/modules/PaymentInfoModal.vue  |   9 +-
 .../feehandle/FeeHandle.vue                   |  12 +-
 .../model/ChargeCertificateEditModel.vue      | 478 +++++++-----------
 5 files changed, 352 insertions(+), 423 deletions(-)

diff --git a/src/views/standardsAssociation/BasicInfo.vue b/src/views/standardsAssociation/BasicInfo.vue
index 5628dfd..a64b768 100644
--- a/src/views/standardsAssociation/BasicInfo.vue
+++ b/src/views/standardsAssociation/BasicInfo.vue
@@ -66,7 +66,7 @@
 <script>
 import { getMemberBaseInfo } from '../../api/standardsAssociationApi'
 import BasicModel from './modules/BasicModel'
-import { mapGetters, mapState } from 'vuex'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'BasicInfo',
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
index f78ef10..006f1f7 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
@@ -15,7 +15,6 @@
         </a-divider>
         <a-row>
           <a-col :span="12">
-
             <a-form-item label="单位全称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input :disabled=true v-model="companyName" placeholder="请输入单位名称"></a-input>
             </a-form-item>
@@ -33,7 +32,16 @@
               <a-input :disabled=true v-model="mobile" placeholder="请输入手机号"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="缴费类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag
+                :disabled=true type="list" v-decorator="['paymentType']" :trigger-change="true"
+                dictCode="certificate_payment_type" placeholder="请选择缴费类型" />
+            </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
@@ -42,24 +50,23 @@
                 dictCode="payment_method" placeholder="请选择缴费方式" />
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date
+                :disabled="checkFlag||detailFlag" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择缴费日期"
+                v-decorator="['submissionTime',validatorRules.submissionTime]" :trigger-change="true"
+                style="width: 100%" />
+            </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=true type="list" v-decorator="['paymentType']" :trigger-change="true"
-                dictCode="certificate_payment_type" placeholder="请选择缴费类型" />
-            </a-form-item>
-          </a-col>
           <a-col :span="12">
             <a-form-item label="缴费单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input :disabled=true v-decorator="['billNumber']" placeholder="请输入缴费单号"></a-input>
             </a-form-item>
           </a-col>
-        </a-row>
 
-        <a-row>
           <a-col :span="12">
             <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number
@@ -68,26 +75,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
-                :disabled="checkFlag||detailFlag" @change="changgeType" type="list"
-                v-decorator="['paymentTime',validatorRules.paymentTime]" :trigger-change="true"
-                dictCode="payment_time" placeholder="请选择缴费时长" />
-            </a-form-item>
-          </a-col>
+          <!--<a-col :span="12">-->
+          <!--  <a-form-item label="缴费时长" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--    <j-dict-select-tag-->
+          <!--      :disabled="checkFlag||detailFlag" @change="changgeType" type="list"-->
+          <!--      v-decorator="['paymentTime',validatorRules.paymentTime]" :trigger-change="true"-->
+          <!--      dictCode="payment_time" placeholder="请选择缴费时长" />-->
+          <!--  </a-form-item>-->
+          <!--</a-col>-->
         </a-row>
-        <a-row>
+        <!--缴费方式为电汇或者现金 -->
+        <a-row v-if="currentSelectPaymentMethod === PaymentMethodEnums.wireTransfer.index || currentSelectPaymentMethod === PaymentMethodEnums.cash.index">
           <a-col :span="12">
-            <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date
-                :disabled="checkFlag||detailFlag" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择缴费时间"
-                v-decorator="['submissionTime',validatorRules.submissionTime]" :trigger-change="true"
-                style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" v-if="paymentMethodFlag==1">
-            <a-form-item label="缴费凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-image-upload
                 isLessThan5M
                 isMultiple
@@ -97,101 +97,12 @@
                 v-decorator="['paymentRecord',validatorRules.paymentRecord]">
               </j-image-upload>
             </a-form-item>
+            <!--<span v-if="!validateCompanyNameFlag" class="paymentRecord-notice">需上传"垫付款说明（盖章"文件）</span>-->
           </a-col>
-          <a-row>
-            <a-col :span="12" v-if="paymentMethodFlag==2">
-              <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-upload
-                  file-type="pdf"
-                  file-type-error-message="请上传pdf文件" :multiple="false" :number="1"
-                  :disabled="checkFlag||detailFlag" bizPath="payment"
-                  v-decorator="['paymentRecord',validatorRules.paymentRecord]"
-                  :trigger-change="true"></j-upload>
-                <span v-show="!detailFlag && !checkFlag" style="color: #bfbfbf">请上传pdf文件</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
         </a-row>
-        <div v-if="paymentMethodFlag==1">
-          <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']" :trigger-change="true"
-                  dictCode="invoice_requirements" placeholder="请选择发票" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12" v-if="invoiceRequirementsFlag">
-              <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input
-                  :disabled="checkFlag||detailFlag"
-                  v-decorator="['headerName',validatorRules.headerName]"
-                  :trigger-change="true" placeholder="请输入付款单位发票抬头"></a-input>
-              </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="['taxNumber',validatorRules.taxNumber]"
-                    placeholder="请输入社会统一代码/税号"></a-input>
-                </a-form-item>
-              </a-col>
-              <!-- 2021-09-23变更 增加 单位地址  增值税发票的时候存在-->
-              <a-col :span="12" v-if="currentSelectInvoiceType === 2">
-                <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', validatorRules.invoiceAddress]"
-                    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"
-                    v-decorator="['invoicePhone', validatorRules.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-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', validatorRules.depositBank]"
-                    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="(e) => {e.target.value = e.target.value.trim()}"
-                    v-decorator="['bankAccount', validatorRules.bankAccount]"
-                    placeholder="请输入银行账户"
-                    :maxLength="50"></a-input>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </template>
-        </div>
-        <!--        缴费备注-->
+
+        <!-- 缴费备注-->
         <a-row>
           <a-col :span="24" class="remark">
             <a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
@@ -203,6 +114,8 @@
           </a-col>
         </a-row>
 
+
+
         <div v-show="typeFlag">
           <a-divider orientation="left">证书需求</a-divider>
           <a-table
@@ -321,6 +234,107 @@
 
         <!-- 邮寄信息 end-->
 
+        <!--发票信息 begin-->
+        <a-divider orientation="left">发票信息</a-divider>
+        <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', validatorRules.invoiceRequirements]"
+                :trigger-change="true"
+                dictCode="invoice_requirements"
+                placeholder="请选择发票"/>
+            </a-form-item>
+            <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index" class="other-notice">本选项不提供任何形式的发票凭证</span>
+          </a-col>
+        </a-row>
+
+        <template v-if="currentSelectInvoiceType">
+          <a-row >
+            <a-col :span="12">
+              <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  :disabled="checkFlag||detailFlag"
+                  v-decorator="['headerName',validatorRules.headerName]"
+                  :trigger-change="true"
+                  placeholder="请输入付款单位发票抬头"></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="['taxNumber',validatorRules.taxNumber]"
+                  placeholder="请输入社会统一代码/税号"></a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <template  v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
+            <a-row>
+              <a-col :span="12" v-if="currentSelectInvoiceType === 2">
+                <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', validatorRules.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', validatorRules.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>
+              <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', validatorRules.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', validatorRules.bankAccount]"
+                    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="['linkBankNumber', validatorRules.linkBankNumber]"
+                    placeholder="请输入联行号"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+          </template>
+
+        </template>
+
+        <!--发票信息 end-->
+
         <div v-show="detailFlag">
           <a-divider orientation="left">审核信息</a-divider>
           <a-table :pagination=false bordered :data-source="checkInfo" :columns="checkColumns">
@@ -341,24 +355,27 @@
 import { httpAction, getFileAccessHttpUrl } from '@/api/memberManage'
 import pick from 'lodash.pick'
 import JDate from '@/components/tools/JDate'
-import JUpload from '@/components/standardsAssociation/JUpload'
+// import JUpload from '@/components/standardsAssociation/JUpload'
 import JImageUpload from '@/components/standardsAssociation/JImageUpload'
 import JDictSelectTag from '@/components/standardsAssociation/JDictSelectTag'
 import { getMemberInfoById, getCertificateById, getCheckInfo, getByMemberTime } from '@/api/standardsAssociationApi'
 import {queryContactInfoByMemberId, queryContactList, queryPostInfoById} from '@api/incomePaymentsApi'
 import CompanySelect from '@comp/customSelect/CompanySelect'
+import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../../enums/memberEnums'
 
 export default {
   name: 'CertificatePaymentInfoModal',
   components: {
     JDate,
     JImageUpload,
-    JUpload,
+    // JUpload,
     JDictSelectTag,
     CompanySelect
   },
   data() {
     return {
+      PaymentMethodEnums,
+      InvoiceRequirementsEnums,
       userId: this.$store.getters.userInfo.memberId,
       // userName: JSON.parse(localStorage.getItem('pro__Login_Userinfo')).value.realname,
       userName: '',
@@ -420,8 +437,8 @@ export default {
           validateTrigger: ['blur', 'change']
         },
         paymentRecord: {
-          rules: [{ required: true, message: '请上传缴费凭证' }],
-          validateTrigger: ['blur', 'change']
+          rules: [{ required: false, message: '请上传缴费凭证/付款说明' }],
+          validateTrigger: ['change']
         },
         headerName: {
           rules: [
@@ -455,6 +472,7 @@ export default {
         },
         depositBank: { rules: [{ required: true, message: '请输入开户银行' }], validateTrigger: 'blur' },
         bankAccount: { rules: [{ required: true, message: '请输入银行账户' }], validateTrigger: 'blur' },
+        linkBankNumber: { rules: [{ required: true, message: '请输入联行号' }], validateTrigger: 'blur' },
         address: {
           rules: [
             { required: true, message: '请输入通讯地址' },
@@ -500,6 +518,8 @@ export default {
       invoiceRequirementsFlag: false,
       // 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票
       currentSelectInvoiceType: 0,
+      // form 表单中 当前选择 缴费方式的值 1-电汇 2-打包会员 3现金
+      currentSelectPaymentMethod: 1,
       startTime: '',
       endTime: '',
       // 申请证书
@@ -637,6 +657,8 @@ export default {
       } else {
         this.invoiceRequirementsFlag = true
       }
+      // 当前选择缴费方式的值
+      this.currentSelectPaymentMethod = Number(this.model.paymentMethod)
       this.currentSelectInvoiceType = Number(record.invoiceRequirements)
       // 审核信息
       this.checkResult = this.model.checkResult
@@ -681,6 +703,8 @@ export default {
       } else {
         this.invoiceRequirementsFlag = true
       }
+      // 当前选择缴费方式的值
+      this.currentSelectPaymentMethod = Number(this.model.paymentMethod)
       this.currentSelectInvoiceType = Number(record.invoiceRequirements)
       // 审核信息
       this.checkResult = this.model.checkResult
@@ -710,6 +734,8 @@ export default {
       } else {
         this.certificatesFlag = false
       }
+      // 当前选择缴费方式的值
+      this.currentSelectPaymentMethod = Number(this.model.paymentMethod)
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'billNumber', 'companyName', 'paymentType', 'validPeriod', 'paymentTime', 'paymentAmount', 'certificatesNum', 'submissionTime', 'checkTime', 'paymentStatus', 'paymentMethod', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'checkResult', 'checkMark', 'checkMember', 'checkMemberId', 'memberId', 'certificate', 'address', 'postcode'))
       })
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 7a2a1e0..e9c1796 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -159,7 +159,7 @@
           </a-col>
         </a-row>
         <!-- 缴费方式为电汇 -->
-        <div v-if="currentSelectPaymentMethod === PaymentMethodEnums.wireTransfer.index">
+        <template v-if="currentSelectPaymentMethod === PaymentMethodEnums.wireTransfer.index">
           <a-row v-show="!addFlag">
             <a-col :span="12">
               <a-form-item label="缴费单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -184,7 +184,7 @@
           <!--    </a-form-item>-->
           <!--  </a-col>-->
           <!--</a-row>-->
-        </div>
+        </template>
 
         <a-row>
           <a-col :span="24" class="remark">
@@ -739,7 +739,8 @@ export default {
       this.selectPaymentTimeValue = record.paymentTime + ''
       // 判断是否是垫付的状态
       this.validateCompanyNameFlag = this.model.headerName === this.memberInfo.companyName
-
+      // 当前选择缴费方式的值
+      this.currentSelectPaymentMethod = Number(this.model.paymentMethod)
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'paymentMethod', 'submissionTime', 'paymentAmount', 'paymentTime', 'paymentRecord', 'billNumber', 'remark', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'linkBankNumber'))
       })
@@ -784,6 +785,8 @@ export default {
 
       // 判断是否是垫付的状态
       this.validateCompanyNameFlag = this.model.headerName === this.memberInfo.companyName
+      // 当前选择缴费方式的值
+      this.currentSelectPaymentMethod = Number(this.model.paymentMethod)
 
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'paymentMethod', 'submissionTime', 'paymentAmount', 'paymentTime', 'paymentRecord', 'billNumber', 'remark', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'linkBankNumber'))
diff --git a/src/views/standardsAssociation/feehandle/FeeHandle.vue b/src/views/standardsAssociation/feehandle/FeeHandle.vue
index eff5023..54e663f 100644
--- a/src/views/standardsAssociation/feehandle/FeeHandle.vue
+++ b/src/views/standardsAssociation/feehandle/FeeHandle.vue
@@ -108,7 +108,7 @@
         <template slot-scope="text,record" slot="paymentStatus">
           <a-tooltip>
             <template slot="title">{{ record.paymentStatus === 1 && record.paymentMethod === PaymentMethodEnums.wireTransfer.index ? '对公银行预计15个工作日完成费用核验，请耐心等待' : text }}</template>
-            <div class="table-text">{{ text }}<span class="inner-notice" v-if="record.paymentStatus === 1 && record.paymentMethod === PaymentMethodEnums.wireTransfer.index">?</span></div>
+            <div class="table-text" :class="'inner-payment-status-'+ record.paymentStatus">{{ text }}<span class="inner-notice" v-if="record.paymentStatus === 1 && record.paymentMethod === PaymentMethodEnums.wireTransfer.index">?</span></div>
           </a-tooltip>
         </template>
 
@@ -551,4 +551,14 @@ export default {
   padding-left: 20px;
 }
 
+.inner-payment-status-1 {
+  color:#33A3DC
+}
+.inner-payment-status-2 {
+  color:#F56C6C
+}
+.inner-payment-status-3 {
+  color:#40835E
+}
+
 </style>
diff --git a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
index 11a8d19..1d908fa 100644
--- a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
+++ b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
@@ -58,42 +58,40 @@
             </a-col>
           </a-row>
           <a-row>
-
-            <a-col :span="12" v-if="model.code">
-              <a-form-item label="证书文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-image-upload
-                  isLessThan5M
-                  :number="1"
-                  bizPath="payment"
-                  v-decorator="['certificateImg',validatorRules.certificateImg]">
-                </j-image-upload>
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-          <a-row v-if="model.code">
-            <a-col :span="12">
-              <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date
-                  date-format="YYYY-MM-DD"
-                  placeholder="请选择生效日期"
-                  v-decorator="['effectDate',validatorRules.effectDate]"
-                  :trigger-change="true"
-                  style="width: 100%"/>
-                <span class="apply-notice">生效日期与上一周期证书的失效日期保持一致，失效日期顺延五年</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="失效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-date
-                  date-format="YYYY-MM-DD"
-                  placeholder="请选择失效日期"
-                  v-decorator="['invalidDate',validatorRules.invalidDate]"
-                  :trigger-change="true"
-                  style="width: 100%"/>
-              </a-form-item>
-            </a-col>
+            <!--<a-col :span="12" v-if="model.code">-->
+            <!--  <a-form-item label="证书文件" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+            <!--    <j-image-upload-->
+            <!--      isLessThan5M-->
+            <!--      :number="1"-->
+            <!--      bizPath="payment"-->
+            <!--      v-decorator="['certificateImg',validatorRules.certificateImg]">-->
+            <!--    </j-image-upload>-->
+            <!--  </a-form-item>-->
+            <!--</a-col>-->
           </a-row>
+          <!--<a-row v-if="model.code">-->
+          <!--  <a-col :span="12">-->
+          <!--    <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--      <j-date-->
+          <!--        date-format="YYYY-MM-DD"-->
+          <!--        placeholder="请选择生效日期"-->
+          <!--        v-decorator="['effectDate',validatorRules.effectDate]"-->
+          <!--        :trigger-change="true"-->
+          <!--        style="width: 100%"/>-->
+          <!--      <span class="apply-notice">生效日期与上一周期证书的失效日期保持一致，失效日期顺延五年</span>-->
+          <!--    </a-form-item>-->
+          <!--  </a-col>-->
+          <!--  <a-col :span="12">-->
+          <!--    <a-form-item label="失效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--      <j-date-->
+          <!--        date-format="YYYY-MM-DD"-->
+          <!--        placeholder="请选择失效日期"-->
+          <!--        v-decorator="['invalidDate',validatorRules.invalidDate]"-->
+          <!--        :trigger-change="true"-->
+          <!--        style="width: 100%"/>-->
+          <!--    </a-form-item>-->
+          <!--  </a-col>-->
+          <!--</a-row>-->
           <a-divider orientation="left">
             缴费信息
           </a-divider>
@@ -137,261 +135,137 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <!--          打包会员-->
-          <div v-if="isWireTransfer === '2'">
+
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input-number
+                  :maxLength="50"
+                  v-decorator="['paymentAmount',validatorRules.paymentAmount]"
+                  placeholder="请输入缴费金额"
+                  style="width: 100%"/>
+              </a-form-item>
+            </a-col>
+            <!--原来打包没有 现在去掉了-->
+            <a-col :span="12">
+              <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-date
+                  date-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请选择缴费日期"
+                  v-decorator="['submissionTime',validatorRules.submissionTime]"
+                  :trigger-change="true"
+                  style="width: 100%"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row v-if="currentSelectPaymentMethod === PaymentMethodEnums.wireTransfer.index || currentSelectPaymentMethod === PaymentMethodEnums.cash.index">
+            <a-col :span="12" >
+              <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-image-upload
+                  isLessThan5M
+                  isMultiple
+                  :number="2"
+                  bizPath="payment"
+                  v-decorator="['paymentRecord',validatorRules.paymentRecord]"
+                  ></j-image-upload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <!--发票信息 begin-->
+          <a-divider orientation="left">发票信息</a-divider>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag
+                  type="list"
+                  v-decorator="['invoiceRequirements',validatorRules.invoiceRequirements]"
+                  @change="invoiceRequirementsChange"
+                  :trigger-change="true"
+                  dictCode="invoice_requirements"
+                  placeholder="请选择发票"/>
+              </a-form-item>
+              <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
+            </a-col>
+          </a-row>
+
+          <template v-if="currentSelectInvoiceType">
             <a-row>
               <a-col :span="12">
-                <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input-number
+                <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
                     :maxLength="50"
-                    v-decorator="['paymentAmount',validatorRules.paymentAmount]"
-                    placeholder="请输入缴费金额"
-                    style="width: 100%"/>
+                    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">
-                  <j-upload
-                    file-type="pdf"
-                    file-type-error-message="请上传pdf文件"
-                    :multiple="false"
-                    :number="1"
-                    bizPath="payment"
-                    v-decorator="['paymentRecord',validatorRules.paymentRecordOne]"
-                    :trigger-change="true"></j-upload>
-                  <span style="color: #bfbfbf">请上传pdf文件</span>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </div>
-          <!--电汇-->
-          <div v-if="isWireTransfer === '1'">
-            <a-row>
-              <a-col :span="12">
-                <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input-number
+                <a-form-item label="社会统一代码/税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input
                     :maxLength="50"
-                    v-model="memberInfoPayment.paymentAmount"
-                    v-decorator="['paymentAmount',validatorRules.paymentAmount]"
-                    placeholder="请输入缴费金额"
-                    style="width: 100%"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-date
-                    date-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="请选择缴费时间"
-                    v-decorator="['submissionTime',validatorRules.submissionTime]"
-                    :trigger-change="true"
-                    style="width: 100%"/>
+                    v-decorator="['taxNumber',{ ...validatorRules.taxNumber,initialValue: currentMemberInfo.taxNo}]"
+                    placeholder="请输入社会统一代码/税号"></a-input>
                 </a-form-item>
               </a-col>
             </a-row>
 
-            <a-row>
-              <a-col :span="12" v-if="isWireTransfer === '1' ||  memberInfoPayment.paymentMethod !== 3 ">
-                <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-image-upload
-                    isLessThan5M
-                    isMultiple
-                    :number="2"
-                    bizPath="payment"
-                    v-decorator="['paymentRecord',validatorRules.paymentRecord]"
-                    v-model="memberInfoPayment.paymentRecord"></j-image-upload>
-                </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>
-                <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
-              </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.trim()}"
-                      v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
-                      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="(e) => {e.target.value = e.target.value.trim()}"
-                      v-decorator="['linkBankNumber',{ ...validatorRules.linkBankNumber, initialValue:currentMemberInfo.linkBankNumber}]"
-                      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">
-                <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input-number
-                    :maxLength="50"
-                    v-model="memberInfoPayment.paymentAmount"
-                    v-decorator="['paymentAmount',validatorRules.paymentAmount]"
-                    placeholder="请输入缴费金额"
-                    style="width: 100%"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-date
-                    date-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="请选择缴费时间"
-                    v-decorator="['submissionTime',validatorRules.submissionTime]"
-                    :trigger-change="true"
-                    style="width: 100%"/>
-                </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
-                    type="list"
-                    v-model="memberInfoPayment.invoiceRequirements"
-                    v-decorator="['invoiceRequirements',validatorRules.invoiceRequirements]"
-                    @change="invoiceRequirementsChange"
-                    :trigger-change="true"
-                    dictCode="invoice_requirements"
-                    placeholder="请选择发票"/>
-                </a-form-item>
-                <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
-              </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.trim()}"
-                      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="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
+             <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
+             <a-row >
+               <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>
+               <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.trim()}"
+                     v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
+                     placeholder="请输入银行账户"
+                     :maxLength="50"></a-input>
+                 </a-form-item>
+               </a-col>
+             </a-row>
+             <a-row >
+               <a-col :span="12">
+                 <a-form-item label="联行号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                   <a-input
+                     @change="(e) => {e.target.value = e.target.value.trim()}"
+                     v-decorator="['linkBankNumber',{ ...validatorRules.linkBankNumber, initialValue:currentMemberInfo.linkBankNumber}]"
+                     placeholder="请输入联行号"
+                     :maxLength="50"></a-input>
+                 </a-form-item>
+               </a-col>
+             </a-row>
+           </template>
+          </template>
+          <!--发票信息 end-->
         </a-form>
       </a-spin>
     </template>
@@ -411,6 +285,7 @@ import JUpload from '@comp/standardsAssociation/JUpload'
 import JDictSelectTag from '@comp/standardsAssociation/JDictSelectTag'
 import { getAction, httpAction } from '@api/memberManage'
 import pick from 'lodash.pick'
+import {InvoiceRequirementsEnums, PaymentMethodEnums} from "../../../enums/memberEnums";
 export default {
   // 收费证书新增申申请驳回后编辑
   name: 'ChargeCertificateEditModel',
@@ -423,6 +298,8 @@ export default {
   },
   data() {
     return {
+      PaymentMethodEnums,
+      InvoiceRequirementsEnums,
       loginUserId: this.$store.getters.userInfo.memberId,
       title: '新增申请',
       visible: false,
@@ -431,6 +308,8 @@ export default {
       invoiceRequirementsFlag: false,
       // 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票
       currentSelectInvoiceType: 0,
+      // form 表单中 当前选择 缴费方式的值 1-电汇 2-打包会员 3现金
+      currentSelectPaymentMethod: 1,
       form: this.$form.createForm(this),
       // 是否是电汇
       isWireTransfer: '1',
@@ -540,7 +419,7 @@ export default {
         },
         paymentRecord: {
           rules: [{
-            required: true, message: '请上传缴费凭证/付款说明!'
+            required: false, message: '请上传缴费凭证/付款说明!'
           }]
         },
         paymentRecordOne: { rules: [{ required: true, message: '请上传打包协议' }] },
@@ -610,8 +489,9 @@ export default {
       this.form.resetFields()
       this.model = Object.assign({}, record)
       this.visible = true
+
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'paymentRecord', 'id', 'certificateImg', 'address', 'postcode', 'mobile', 'liaisonMan', 'companyName', 'certificateType', 'effectDate', 'invalidDate', 'reasonsRenewal', 'code',))
+        // this.form.setFieldsValue(pick(this.model, 'paymentRecord', 'id', 'certificateImg', 'address', 'postcode', 'mobile', 'liaisonMan', 'companyName', 'certificateType', 'effectDate', 'invalidDate', 'reasonsRenewal', 'code',))
       })
       // 查询证书最新的缴费信息
       // 获取驳回的缴费信息
@@ -622,11 +502,15 @@ export default {
       getAction('/certificatePaymentInfo/getLastCertificatePayment?' + params).then((res) => {
         if (res.success) {
           this.memberInfoPayment = res.result
+          let params = Object.assign({}, this.model, this.memberInfoPayment)
           this.isWireTransfer = this.memberInfoPayment.paymentMethod + ''
           // 对发票的显示 进行操作
           this.invoiceRequirementsChange(res.result.invoiceRequirements)
+          // 当前选择缴费方式的值
+          this.currentSelectPaymentMethod = Number(res.result.paymentMethod)
+          // let ids = ['certificateType', 'code', 'address', 'postcode', 'companyName', 'liaisonMan', 'mobile', 'paymentMethod', 'paymentAmount', 'submissionTime', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'linkBankNumber']
           this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.memberInfoPayment, 'submissionTime', 'paymentAmount', 'certificateType', 'headerName', 'invoiceRequirements', 'paymentMethod', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'linkBankNumber','paymentRecord', 'id', 'address', 'postcode', 'mobile', 'liaisonMan', 'effectDate', 'invalidDate', 'reasonsRenewal', 'code'))
+            this.form.setFieldsValue(pick(params, 'certificateType', 'code', 'address', 'postcode', 'companyName', 'liaisonMan', 'mobile', 'paymentMethod', 'paymentAmount', 'submissionTime', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'linkBankNumber'))
           })
         } else {
           console.log(res.message)
@@ -694,6 +578,11 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          // 缴费方式为电汇、打包会员，汇款凭证必填
+          if((this.currentSelectPaymentMethod === PaymentMethodEnums.wireTransfer.index || this.currentSelectPaymentMethod === PaymentMethodEnums.cash.index) && !values.paymentRecord) {
+            this.$message.warning('请上传缴费凭证/付款说明')
+            return
+          }
           that.confirmLoading = true
           const httpurl = '/vinCertificate/vinCertificate/addChargeCertificate'
           const method = 'post'
@@ -741,23 +630,24 @@ export default {
     },
     /* 缴费方式*/
     changePaymentMethod(value) {
+      this.currentSelectPaymentMethod = Number(value)
       // 1 是电汇 2 打包 3 是现金
-      this.isWireTransfer = value
-      this.form.resetFields(['paymentType', 'paymentAmount', 'paymentTime', 'submissionTime', 'paymentRecord'])
-      if (value !== '1') {
-        this.paymentMethodFlag = true
-      } else {
-        this.paymentMethodFlag = false
-      }
+      // this.isWireTransfer = value
+      // this.form.resetFields(['paymentType', 'paymentAmount', 'paymentTime', 'submissionTime', 'paymentRecord'])
+      // if (value !== '1') {
+      //   this.paymentMethodFlag = true
+      // } else {
+      //   this.paymentMethodFlag = false
+      // }
     },
     // 校验是否选择 要发票
     invoiceRequirementsChange(value) {
       this.currentSelectInvoiceType = Number(value)
-      if (this.currentSelectInvoiceType !== 0) {
-        this.invoiceRequirementsFlag = true
-      } else {
-        this.invoiceRequirementsFlag = false
-      }
+      // if (this.currentSelectInvoiceType !== 0) {
+      //   this.invoiceRequirementsFlag = true
+      // } else {
+      //   this.invoiceRequirementsFlag = false
+      // }
     },
     /*
       * 续费选择换证