From 9fb5400cb027a3a126e270225a85fa0e88d27f1e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 29 Jul 2022 11:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardsAssociation/CertificateManagement.vue     |  9 +++++++++
 .../PaymentInfo/modules/PaymentInfoModal.vue           |  9 +++++++--
 .../model/ChargeCertificateEditModel.vue               | 10 ++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 449d4a8..1f5bb5a 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -46,6 +46,15 @@
                   </j-date>
                 </a-form-item>
               </a-col>
+              <a-col :span="6" :xl="6" :lg="7" :md="8" :sm="24">
+                <a-form-item label="证书形式" class="certificate-type-item">
+                  <j-dict-select-tag
+                    placeholder="请选择证书形式"
+                    v-model="queryParam.certificateModality"
+                    :title="queryParam.certificateModality"
+                    dictCode="certificate_modality" />
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :xl="6" :lg="7" :md="8" :sm="24" v-has=" 'vin:applicationHistory'">
               <a-form-item label="单位全称">
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index ed95005..57ac16c 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -50,7 +50,7 @@
       </template>
       <a-form :form="form" style="margin-left: 10px" :selfUpdate="true">
         <a-divider orientation="left">
-          缴费信息<font color="red">（缴费时长5年可绑定两张证书）</font>
+          缴费信息
           <span
             v-if="isMember === 'member'"
             class="charge-notice"
@@ -130,7 +130,7 @@
                     副理事单位
                   </template>
                   <template v-else>
-                    <span v-if="initVal == '2' ">VIP会员</span>
+                    <span v-if="initVal == '2' || initVal ===  '3'  ">VIP会员</span>
                     <span v-else>普通会员</span>
                   </template>
                 </td>
@@ -934,8 +934,11 @@ export default {
       // 审核信息
       this.checkResult = this.model.checkResult
       this.isCash = this.model.paymentMethod + ''
+      // 缴费时长
+      this.initVal = record.paymentTime + ''
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'certificateArr', 'billNumber', 'companyName', 'paymentType', 'validPeriod', 'paymentTime', 'paymentAmount', 'certificatesNum', 'submissionTime', 'checkTime', 'paymentStatus', 'paymentMethod', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'checkMember', 'checkMemberId', 'memberId', 'certificate', 'address', 'postcode', 'serviceCharge', 'remark'))
+        this.validateCompanyName()
       })
     },
     async edit(record) {
@@ -986,6 +989,8 @@ export default {
       }
       // 缴费单号
       // this.billNumber = this.model.billNumber
+      // 缴费时长
+      this.initVal = record.paymentTime + ''
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'certificateArr', 'billNumber', 'companyName', 'paymentType', 'validPeriod', 'paymentTime', 'paymentAmount', 'certificatesNum', 'submissionTime', 'checkTime', 'paymentStatus', 'paymentMethod', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'checkResult', 'checkMark', 'checkMember', 'checkMemberId', 'memberId', 'address', 'postcode', 'serviceCharge', 'remark'))
         this.validateCompanyName()
diff --git a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
index b7d1063..a451871 100644
--- a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
+++ b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
@@ -222,6 +222,7 @@
                     dictCode="invoice_requirements"
                     placeholder="请选择发票"/>
                 </a-form-item>
+                <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
               </a-col>
             </a-row>
             <template v-if="invoiceRequirementsFlag">
@@ -324,6 +325,7 @@
                     dictCode="invoice_requirements"
                     placeholder="请选择发票"/>
                 </a-form-item>
+                <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
               </a-col>
             </a-row>
             <template v-if="invoiceRequirementsFlag">
@@ -892,4 +894,12 @@ export default {
   left: 25%
 }
 
+.other-notice{
+  color: #f5222d;
+  position: absolute;
+  bottom: 5px;
+  left: 25%
+}
+
+
 </style>