From 04cd4d370ab8f3636b72019d3f1567250e61d051 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 26 Jul 2023 14:57:04 +0800
Subject: [PATCH] =?UTF-8?q?[update]-=20=E4=BC=9A=E5=91=98=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E3=80=81=E8=AF=81=E4=B9=A6=E7=BC=B4=E8=B4=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/memberEnums.js                      |   7 +
 .../CertificateManagement.vue                 |  85 ++-------
 .../modules/CombinationPaymentModal.vue       |  12 +-
 .../PaymentInfo/modules/PaymentInfoModal.vue  |  11 +-
 .../feehandle/FeeHandle.vue                   |   6 +-
 .../memberInfo/PaymentInfo.vue                |   3 +
 .../model/RenewChargeEditModel.vue            | 154 ++++++++--------
 .../model/RenewChargeModel.vue                | 170 +++++++++---------
 8 files changed, 205 insertions(+), 243 deletions(-)

diff --git a/src/enums/memberEnums.js b/src/enums/memberEnums.js
index cea2526..9613886 100644
--- a/src/enums/memberEnums.js
+++ b/src/enums/memberEnums.js
@@ -31,3 +31,10 @@ export const PaymentMethodEnums = {
   pack: { name: '打包会员', index: 2 },
   cash: { name: '现金', index: 3 }
 }
+
+// 是否需要发票
+export const InvoiceRequirementsEnums = {
+  noNeed: { name: '不需要', index: 0 },
+  plain: { name: '增值税普通发票', index: 1 },
+  special: { name: '增值税专用发票', index: 2 }
+}
diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 4843c34..7de6581 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -103,25 +103,20 @@
 
           <div slot="action" class="action-span-cell" slot-scope="text, record">
             <!-- 待支付 不显示 ,其他状态均显示撤回-->
-            <a v-if="record.certificateStatus !== CertificateStatusEnums.toPay.index && isMemberFlag "
+            <a v-if="Number(record.certificateStatus) !== CertificateStatusEnums.toPay.index && isMemberFlag "
                @click="handleWithdraw(record)">撤回</a>
+
             <a @click="handleDetail(record)">查看</a>
 
             <!-- 已绑定的证书不能续费  已支付已缴费的不能续费 需要流程走完才能续费 v-has="'vin:renew'"-->
-            <a v-show="(Number(record.certificateStatus) === 4 ||Number(record.certificateStatus) === 5 || Number(record.certificateStatus) === 7) && isMemberFlag ">
-              <a href="javascript:;" @click="renewCharge(record)">续费</a>
-            </a>
-            <a
-              v-show="(isMemberFlag && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) &&  record.paymentStatus !== 4">
-              <a href="javascript:;"
-                 @click="((record.certificateStatus == 6 && record.chargeType == 2 && record.paymentStatus !== 4) || record.certificateStatus == 0) && handleEditRenew(record) && isMemberFlag">编辑</a>
-            </a>
+            <a v-if="(Number(record.certificateStatus) === 4 ||Number(record.certificateStatus) === 5 || Number(record.certificateStatus) === 7) && isMemberFlag " @click="renewCharge(record)">续费</a>
+
+            <a v-if="(isMemberFlag && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) &&  record.paymentStatus !== 4" @click="handleEditRenew(record)">编辑</a>
             <!--         会员 只有企业证书才 正常使用 已绑定的证书 可授权申请-->
             <a
               v-show="roleCode === 'member'&&  record.certificateType == 2 && (record.certificateStatus == 4 ||  record.certificateStatus == 1) && isMemberFlag"
-            >
-              <a href="javascript:;" @click="authorizationFunc(record)">授权申请</a>
-            </a>
+              @click="authorizationFunc(record)"
+            >授权申请</a>
 
             <!-- 管理员上传的缴费会员不能删除  record.paymentStatus !== 4-->
             <a
@@ -155,13 +150,13 @@
       <!--    查看证书-->
       <CheckCertificateModel ref="checkModalForm"></CheckCertificateModel>
 
-      <!--    绑定会员 窗口-->
+      <!--    绑定会员 窗口 --已弃用-- -->
       <bind-member-model ref="bindMemberModelForm" @ok="modalFormOk"></bind-member-model>
 
       <!--    续费 窗口-->
       <renew-charge-model ref="renewChargeModelForm" @ok="modalFormOk"></renew-charge-model>
 
-      <!--    换证 窗口-->
+      <!--    换证 窗口--已弃用---->
       <replace-ment-model ref="replaceMentModelForm" @ok="modalFormOk" @affirm="handleAffirm"></replace-ment-model>
 
       <!--    换证确认 窗口-->
@@ -527,26 +522,12 @@ export default {
       // if(!(record.chargeType != 1 && record.certificateModality == 3 && record.certificateStatus == 5)){
       //   return;
       // }
-      this.$refs.renewChargeModelForm.isChangeCer = record.certificateType
       this.$refs.renewChargeModelForm.edit(record)
 
-      // this.$refs.modalForm.title = '续费'
-      // this.$refs.modalForm.disableSubmit = true
-      // // 换证显示 1是世界证书
-      // this.$refs.modalForm.isChangeCer = record.certificateType
-      // // 证书续费时使用7号窗口
-      // this.$refs.modalForm.pageType = 7
-      // this.$refs.modalForm.edit2(record)
     },
     // 换证
     replacement: function (record) {
       this.$refs.replaceMentModelForm.edit(record)
-
-      // this.$refs.modalForm.title = '换证'
-      // this.$refs.modalForm.disableSubmit = true
-      // // 换证的时候使用8号窗口
-      // this.$refs.modalForm.pageType = 8
-      // this.$refs.modalForm.edit3(record)
     },
     // 编辑: 包括免费证书，收费证书，续费，换证
     handleEditRenew: function (record) {
@@ -555,8 +536,6 @@ export default {
       // 证书是否免费  1-免费 2-付费
       record.chargeType = Number(record.chargeType)
       // 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书
-      // this.$refs.modalForm.title = ''
-      // this.$refs.modalForm.disableSubmit = true
       //  certificateStatus --证书状态-待支付
       if (record.certificateStatus === CertificateStatusEnums.toPay.index) {
         // 免费证书
@@ -569,69 +548,31 @@ export default {
               freeCount = res.result
               this.$refs.freeCertificateEditModel.freeCountVin = freeCount + 1
               this.$refs.freeCertificateEditModel.edit(record)
-
-              // this.$refs.modalForm.freeCountVin = freeCount + 1
-              // this.$refs.modalForm.title = '新增申请'
-              // this.$refs.modalForm.disableSubmit = false
-              // this.$refs.modalForm.pageType = 10
-              // this.$refs.modalForm.edit5(record)
             })
             return
-          } else if (record.certificateModality === 1) {
-            // 免费证书换证编辑
+          } else if (record.certificateModality === CertificateModalityEnums.changeCert.index) {
+            // 免费证书换证编辑 --已弃用
             this.$refs.FreeCertificateReplaceEditModel.edit(record)
-
-            // this.$refs.modalForm.title = '换证'
-            // this.$refs.modalForm.disableSubmit = true
-            // // 换证的时候使用13号窗口
-            // this.$refs.modalForm.pageType = 13
-            // this.$refs.modalForm.edit8(record)
           }
         } else if (record.chargeType === 2 && record.certificateModality === 4) {
           // 收费证书编辑
           this.$refs.ChargeCertificateEditModel.edit(record)
 
-          // this.$refs.modalForm.title = '新增申请'
-          // this.$refs.modalForm.disableSubmit = false
-          // this.$refs.modalForm.pageType = 11
-          // this.$refs.modalForm.edit6(record)
         } else if (record.chargeType === 2 && record.certificateModality === 2) {
-          // 续费编辑
+          // 收费证书 - 续费编辑
           this.$refs.RenewChargeEditModel.edit(record)
 
-          // this.$refs.modalForm.title = '续费'
-          // this.$refs.modalForm.disableSubmit = true
-          // // 证书续费编辑时使用12号窗口
-          // this.$refs.modalForm.pageType = 12
-          // this.$refs.modalForm.edit7(record)
         } else if (record.chargeType === 2 && record.certificateModality === 1) {
-          // // 换证编辑
+          // // 换证编辑--弃用
           this.$refs.FreeCertificateReplaceEditModel.edit(record)
-
-          // this.$refs.modalForm.title = '换证'
-          // this.$refs.modalForm.disableSubmit = true
-          // // 换证的时候使用13号窗口
-          // this.$refs.modalForm.pageType = 13
-          // this.$refs.modalForm.edit8(record)
         }
       } else {
         // 新增证书缴费编辑窗口
         if (record.chargeType === 2 && record.certificateModality === 4 && record.certificateStatus === 6) {
           this.$refs.ChargeCertificateEditModel.edit(record)
-
-          // this.$refs.modalForm.title = '新增申请'
-          // this.$refs.modalForm.disableSubmit = false
-          // this.$refs.modalForm.pageType = 11
-          // this.$refs.modalForm.edit6(record)
         } else if (record.chargeType === 2 && record.certificateModality === 2 && record.certificateStatus === 6) {
           // 续费编辑
           this.$refs.RenewChargeEditModel.edit(record)
-
-          // this.$refs.modalForm.title = '续费'
-          // this.$refs.modalForm.disableSubmit = true
-          // // 证书续费编辑时使用12号窗口
-          // this.$refs.modalForm.pageType = 12
-          // this.$refs.modalForm.edit7(record)
         }
       }
     },
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index 3821bfd..7fda124 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -134,7 +134,7 @@
               </a-form-item>
             </a-col>
           </template>
-          <!-- 缴费方式为协议会员-->
+          <!-- 缴费方式为打包会员-->
           <template v-if="paymentMethodFormValue && paymentMethodFlag">
             <!--<a-col :span="12">-->
             <!--  <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -553,6 +553,7 @@ import {
 import JUpload from '@/components/standardsAssociation/JUpload'
 import PreViewImgModal from './PreViewImgModal'
 import { commonMemberCost, vipMemberCost,upgradeVip,queryContactList,queryPostInfoById,queryContactInfoByMemberId } from '@api/incomePaymentsApi'
+import {PaymentMethodEnums} from "../../../../enums/memberEnums";
 
 export default {
   name: 'PaymentInfoModal',
@@ -800,7 +801,7 @@ export default {
         invoicePhone: '', // 电话号码
         depositBank: '', // 开户银行
         bankAccount: '', // 银行账户
-        invoiceInfoObj: '' // 联行号
+        linkBankNumber: '' // 联行号
       },
       certificate: [], // 证书信息
       checkInfo: [], // 审核信息
@@ -1158,7 +1159,14 @@ export default {
         this.checkResult = 2
         this.model.paymentStatus = 3
       } else {
+        // 如果上传了付款凭证 则状态为费用核验中
         this.model.paymentStatus = 1
+        // 判断缴费方式 和 是否上传付款凭证，如果没有上传付款凭证，则下一步状态为 待上传，
+        // 缴费方式是打包会员--上传的状态修改成 待上传
+        // if(Number(values.paymentMethod) === PaymentMethodEnums.pack.index) {
+        //   this.model.paymentStatus = 4
+        // }
+        // this.model.paymentStatus = 1
       }
 
       const formData = Object.assign(this.model, values)
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 8c79d7d..7a2a1e0 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -102,7 +102,7 @@
               <j-date
                 :disabled="checkFlag||detailFlag"
                 date-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择缴费时间"
+                placeholder="请选择缴费日期"
                 v-decorator="['submissionTime',{...validatorRules.submissionTime, initialValue: model.submissionTime}]"
                 :trigger-change="true"
                 style="width: 100%" />
@@ -283,7 +283,7 @@
                 dictCode="invoice_requirements"
                 placeholder="请选择发票" />
             </a-form-item>
-            <span v-if="currentSelectInvoiceType === 0" class="other-notice">本选项不提供任何形式的发票凭证</span>
+            <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index" class="other-notice">本选项不提供任何形式的发票凭证</span>
           </a-col>
         </a-row>
         <template v-if="currentSelectInvoiceType">
@@ -305,13 +305,13 @@
                 <a-input
                   :disabled="checkFlag||detailFlag"
                   @change="event => event.target.value = event.target.value.trim()"
-                  v-decorator="['taxNumber',{ ...validatorRules.taxNumber, initialValue: memberInfo.taxNumber},]"
+                  v-decorator="['taxNumber',{ ...validatorRules.taxNumber, initialValue: memberInfo.taxNumber}]"
                   placeholder="请输入社会统一代码/税号"
                   :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
           </a-row>
-          <template v-if="currentSelectInvoiceType === 2">
+          <template v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
             <!-- 2021-09-23变更 增加 单位地址 电话号码  开户银行 银行账户 增值税发票的时候存在-->
             <a-row >
               <a-col :span="12">
@@ -442,7 +442,7 @@ import {
 import PreViewImgModal from './PreViewImgModal'
 import { commonMemberCost, vipMemberCost,upgradeVip,queryContactInfoByMemberId,queryContactList,queryPostInfoById } from '@api/incomePaymentsApi'
 import CompanySelect from '@comp/customSelect/CompanySelect'
-import {PaymentMethodEnums} from '../../../../enums/memberEnums'
+import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../../enums/memberEnums'
 export default {
   name: 'PaymentInfoModal',
   components: {
@@ -455,6 +455,7 @@ export default {
   data() {
     return {
       PaymentMethodEnums,
+      InvoiceRequirementsEnums,
       // 会员用户id
       userId: this.$store.getters.userInfo.memberId,
       isMember: true,
diff --git a/src/views/standardsAssociation/feehandle/FeeHandle.vue b/src/views/standardsAssociation/feehandle/FeeHandle.vue
index adae6f3..eff5023 100644
--- a/src/views/standardsAssociation/feehandle/FeeHandle.vue
+++ b/src/views/standardsAssociation/feehandle/FeeHandle.vue
@@ -141,7 +141,7 @@
 
           <!-- 证书缴费的相关操作-->
           <template v-else>
-            <a v-if="record.paymentStatus === 4 || record.paymentStatus === 2" href="javascript:;" @click="handleCertificateUploadRecord(record)">上传凭证</a>
+            <a v-if="record.paymentStatus === 4 || record.paymentStatus === 2" @click="handleCertificateUploadRecord(record)">上传凭证</a>
             <a @click="handleCertificateDetail(record)">查看</a>
           </template>
 
@@ -183,12 +183,12 @@ import CombinationPaymentModal from '@views/standardsAssociation/PaymentInfo/mod
 import UploadRecordModal from '@views/standardsAssociation/PaymentInfo/modules/UploadRecordModal'
 import CertificatePaymentInfoModal from '../PaymentInfo/modules/CertificatePaymentInfoModal'
 
-import {getAction, postAction, deleteAction} from '@/api/memberManage'
+import {getAction, deleteAction} from '@/api/memberManage'
 import {filterObj} from '../../../utils/util'
 import {RangeDateMixin} from '@/mixins/RangeDateMixin'
 import {mixinDevice} from '@/utils/mixin'
 import {downNewestNotice, previewPdf , withDrawPayment} from '../../../api/standardsAssociationApi'
-import {PaymentMethodEnums} from "../../../enums/memberEnums";
+import {PaymentMethodEnums} from '../../../enums/memberEnums'
 
 const columns = [
   {
diff --git a/src/views/standardsAssociation/memberInfo/PaymentInfo.vue b/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
index daa1d74..33bf75c 100644
--- a/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
+++ b/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
@@ -159,6 +159,9 @@ export default {
       url: {
         list: '/paymentInfo/list'
       },
+      filters:{
+        paymentModuleCategory: 1 // 默认查询会员缴费的信息
+      },
       loading: false,
       disableMixinCreated: false
     }
diff --git a/src/views/standardsAssociation/model/RenewChargeEditModel.vue b/src/views/standardsAssociation/model/RenewChargeEditModel.vue
index d041c1c..7de49d1 100644
--- a/src/views/standardsAssociation/model/RenewChargeEditModel.vue
+++ b/src/views/standardsAssociation/model/RenewChargeEditModel.vue
@@ -102,7 +102,7 @@
             <!--缴费方式为电汇或者现金 -->
             <template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index">
               <a-col :span="12">
-                <a-form-item label="缴费凭证/付款说明2" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-image-upload
                     isLessThan5M
                     isMultiple
@@ -127,6 +127,17 @@
 
           </a-row>
 
+
+          <!--    缴费备注-->
+          <a-row>
+            <a-col :span="24" class="remark">
+              <a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
+                <a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
+              </a-form-item>
+              <span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
+            </a-col>
+          </a-row>
+
           <!--发票信息 begin-->
           <a-divider orientation="left">发票信息</a-divider>
           <a-row>
@@ -139,11 +150,11 @@
                   :trigger-change="true"
                   dictCode="invoice_requirements"
                   placeholder="请选择发票"/>
-                <span v-if="!invoiceRequirementsFlag" class="apply-code-notice">本选项不提供任何形式的发票凭证</span>
+                <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index" class="apply-code-notice">本选项不提供任何形式的发票凭证</span>
               </a-form-item>
             </a-col>
           </a-row>
-          <template v-if="invoiceRequirementsFlag">
+          <template v-if="currentSelectInvoiceType">
             <a-row>
               <a-col :span="12">
                 <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -167,71 +178,63 @@
               </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.invoicePhone, 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 v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
+              <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.invoicePhone, 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-row>
-            <a-col :span="24" class="remark">
-              <a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
-                <a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
-              </a-form-item>
-              <span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
-            </a-col>
-          </a-row>
-
         </a-form>
       </a-spin>
     </template>
@@ -252,7 +255,7 @@ import JDictSelectTag from '@comp/standardsAssociation/JDictSelectTag'
 import JSearchSelectTag from '@comp/standardsAssociation/JSearchSelectTag'
 import { getAction, httpAction } from '@api/memberManage'
 import pick from 'lodash.pick'
-import {PaymentMethodEnums} from '../../../enums/memberEnums'
+import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../enums/memberEnums'
 
 export default {
   // 证书续费编辑 窗口
@@ -268,6 +271,7 @@ export default {
       title: '续费',
       loginUserId: this.$store.getters.userInfo.memberId,
       PaymentMethodEnums,
+      InvoiceRequirementsEnums,
       visible: false,
       confirmLoading: false,
       pageType: 12,
@@ -291,7 +295,6 @@ export default {
       model: {},
       // 记录续费证书选择
       selectType: 1,
-      invoiceRequirementsFlag: false,
       // 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票
       currentSelectInvoiceType: 0,
       validatorRules: {
@@ -361,7 +364,7 @@ export default {
         },
         paymentMethod: {
           rules: [{
-            required: true, message: '请输入缴费方式!'
+            required: true, message: '请选择缴费方式!'
           }]
         },
         paymentAmount: {
@@ -384,7 +387,7 @@ export default {
         },
         paymentRecord: {
           rules: [{
-            required: true, message: '请上传缴费凭证/付款说明!'
+            required: false, message: '请上传缴费凭证/付款说明!'
           }]
         },
         paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
@@ -500,7 +503,7 @@ export default {
     saveRenewChargeCertificate() {
       this.editHandleRenewChargeCertificateOk()
     },
-    // 添加 证书续费信息
+    // 暂存 -添加 证书续费信息
     editHandleRenewChargeCertificateOk: function() {
       const that = this
       // 触发表单验证
@@ -563,6 +566,12 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          // 缴费方式为电汇，汇款凭证必填
+          if((this.paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || this.paymentMethodFormValue === PaymentMethodEnums.cash.index) && !values.paymentRecord) {
+            this.$message.warning('请上传缴费凭证/付款说明')
+            return
+          }
+
           that.confirmLoading = true
           const httpurl = '/certificatePaymentInfo/addVinChargeInfo'
           const method = 'post'
@@ -625,11 +634,6 @@ export default {
     // 校验是否选择 要发票
     invoiceRequirementsChange(value) {
       this.currentSelectInvoiceType = Number(value)
-      if (this.currentSelectInvoiceType !== 0) {
-        this.invoiceRequirementsFlag = true
-      } else {
-        this.invoiceRequirementsFlag = false
-      }
     },
     handleCancel() {
       this.visible = false
diff --git a/src/views/standardsAssociation/model/RenewChargeModel.vue b/src/views/standardsAssociation/model/RenewChargeModel.vue
index 4681c96..6af200e 100644
--- a/src/views/standardsAssociation/model/RenewChargeModel.vue
+++ b/src/views/standardsAssociation/model/RenewChargeModel.vue
@@ -117,7 +117,7 @@
             <!--缴费方式为电汇或者现金 -->
             <template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index">
               <a-col :span="12">
-                <a-form-item label="缴费凭证/付款说明2" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-image-upload
                     isLessThan5M
                     isMultiple
@@ -142,6 +142,16 @@
             </a-col>
           </a-row>
 
+          <!--  缴费备注-->
+          <a-row>
+            <a-col :span="24" class="remark">
+              <a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
+                <a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
+              </a-form-item>
+              <span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
+            </a-col>
+          </a-row>
+
           <!--发票信息 begin-->
           <a-divider orientation="left">发票信息</a-divider>
           <a-row>
@@ -154,11 +164,11 @@
                   :trigger-change="true"
                   dictCode="invoice_requirements"
                   placeholder="请选择发票"/>
-                <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
+                <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index " class="other-notice">本选项不提供任何形式的发票凭证</span>
               </a-form-item>
             </a-col>
           </a-row>
-          <template v-if="invoiceRequirementsFlag">
+          <template v-if="currentSelectInvoiceType">
             <a-row>
               <a-col :span="12">
                 <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -182,73 +192,64 @@
               </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',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', 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',{ rules: validatorRules.invoicePhone.rules, initialValue: currentMemberInfo.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
-                    @change="event => event.target.value = event.target.value.trim()"
-                    v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',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',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',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',{ rules: validatorRules.linkBankNumber.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.linkBankNumber}]"
-                    placeholder="请输入联行号"
-                    :maxLength="50"></a-input>
-                </a-form-item>
-              </a-col>
-            </a-row>
+            <template v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
+              <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',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', 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',{ rules: validatorRules.invoicePhone.rules, initialValue: currentMemberInfo.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>
+                <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',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',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',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',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',{ rules: validatorRules.linkBankNumber.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.linkBankNumber}]"
+                      placeholder="请输入联行号"
+                      :maxLength="50"></a-input>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </template>
+
           </template>
           <!--发票信息 end-->
 
-          <!--  缴费备注-->
-          <a-row>
-            <a-col :span="24" class="remark">
-              <a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
-                <a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
-              </a-form-item>
-              <span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
-            </a-col>
-          </a-row>
-
-
-
         </a-form>
       </a-spin>
     </template>
@@ -269,8 +270,7 @@ import JDictSelectTag from '@comp/standardsAssociation/JDictSelectTag'
 import JDate from '@comp/tools/JDate'
 import { getAction, httpAction } from '@api/memberManage'
 import pick from 'lodash.pick'
-import {PaymentMethodEnums} from '../../../enums/memberEnums';
-import {InvoiceTypeEnums} from "../../../enums/commonEnum";
+import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../enums/memberEnums'
 
 export default {
   // 证书续费 窗口
@@ -285,6 +285,7 @@ export default {
   data() {
     return {
       PaymentMethodEnums,
+      InvoiceRequirementsEnums,
       loginUserId: this.$store.getters.userInfo.memberId,
       title: '续费',
       visible: false,
@@ -295,10 +296,9 @@ export default {
       // 记录续费证书选择
       selectType: 1,
       // 当前选中的发票类型
-      currentSelectInvoiceType: 2,
+      currentSelectInvoiceType: InvoiceRequirementsEnums.special.index,
       // form 表单中缴费方式的值
       paymentMethodFormValue: 1,
-      invoiceRequirementsFlag: false,
       form: this.$form.createForm(this),
       labelCol: {
         xs: { span: 24 },
@@ -387,7 +387,7 @@ export default {
         },
         paymentMethod: {
           rules: [{
-            required: true, message: '请输入缴费方式!'
+            required: true, message: '请选择缴费方式!'
           }]
         },
         paymentAmount: {
@@ -410,7 +410,7 @@ export default {
         },
         paymentRecord: {
           rules: [{
-            required: true, message: '请上传缴费凭证/付款说明!'
+            required: false, message: '请上传缴费凭证/付款说明!'
           }]
         },
         paymentRecord1: { rules: [{ required: false, message: '请上传打包协议' }] },
@@ -495,13 +495,10 @@ export default {
       this.model = {}
       this.model = Object.assign({}, record)
       this.visible = true
-      // 是否要发票设置为true 默认全部需要发票;
-      // this.invoiceRequirementsFlag = true
       // 设置默认进来发票选择增值税发票
-      this.invoiceRequirementsChange(InvoiceTypeEnums.special.index)
+      this.invoiceRequirementsChange(InvoiceRequirementsEnums.special.index)
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'submissionTime', 'paymentMethod', 'paymentRecord', 'paymentAmount', 'invoiceRequirements'))
-        // this.validateCompanyName()
         // 初始化的时候默认不是垫付
         this.validateCompanyNameFlag = true
       })
@@ -509,11 +506,6 @@ export default {
     // 校验是否选择 要发票
     invoiceRequirementsChange(value) {
       this.currentSelectInvoiceType = Number(value)
-      if (this.currentSelectInvoiceType !== 0) {
-        this.invoiceRequirementsFlag = true
-      } else {
-        this.invoiceRequirementsFlag = false
-      }
       if(value === '2'){
         this.validateCompanyName()
       }
@@ -547,16 +539,22 @@ export default {
         this.model.code = originCode
       }
     },
-    // 证书续费
+    // 提交- 证书续费
     renewChargeCertificate() {
       this.handleRenewChargeCertificateOk()
     },
-    // 添加 证书续费信息
+    // 暂存-添加 证书续费信息
     handleRenewChargeCertificateOk: function() {
       const that = this
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          // 缴费方式为电汇，汇款凭证必填
+          if((this.paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || this.paymentMethodFormValue === PaymentMethodEnums.cash.index) && !values.paymentRecord) {
+            this.$message.warning('请上传缴费凭证/付款说明')
+            return
+          }
+
           that.confirmLoading = true
           const httpurl = '/certificatePaymentInfo/addVinChargeInfo'
           const method = 'post'
@@ -600,11 +598,11 @@ export default {
       })
     },
 
-    // 预处理续费信息
+    // 暂存-预处理续费信息
     preSaveRenewChargeCertificate() {
       this.preHandleRenewChargeCertificateOk()
     },
-    // 添加 证书续费信息
+    // 暂存-添加 证书续费信息
     preHandleRenewChargeCertificateOk: function() {
       const that = this
       // 触发表单验证