From 820ed4220348e8b06c95161db4100104cef830d3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Aug 2022 09:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CertificateManagement.vue                 |  3 +-
 .../modules/CertificatePaymentInfoModal.vue   |  4 +-
 .../modules/CombinationPaymentModal.vue       |  6 +--
 .../PaymentInfo/modules/PaymentInfoModal.vue  |  2 +-
 .../model/BindMemberModel.vue                 |  2 +-
 .../model/ChargeCertificateEditModel.vue      |  2 +-
 .../model/ChargeCertificateModel.vue          |  2 +-
 .../model/CheckCertificateModel.vue           |  2 +-
 .../model/FreeCertificateEditModel.vue        |  2 +-
 .../model/FreeCertificateModel.vue            |  2 +-
 .../model/FreeCertificateReplaceEditModel.vue |  2 +-
 .../model/RenewChargeModel.vue                | 39 +++++++++++++++++--
 12 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 1f5bb5a..ef15ab1 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -119,7 +119,7 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
 <!--           待支付 不显示 -->
-          <a v-if="record.certificateStatus !== '0' " @click="handleWithdraw(record)">撤回</a>
+          <a v-if="record.certificateStatus+'' !== '0' " @click="handleWithdraw(record)">撤回</a>
           <a @click="handleDetail(record)">查看</a>
           <a v-show="record.certificateStatus == 4">
             <a href="javascript:;" @click="(record.certificateStatus == 4) && bindMember(record)">绑定会员</a>
@@ -549,7 +549,6 @@ export default {
     },
     // 编辑: 包括免费证书，收费证书，续费，换证
     handleEditRenew: function (record) {
-      console.log(record)
       record.certificateModality = Number(record.certificateModality) // 证书形式
       record.certificateStatus = Number(record.certificateStatus) // 证书的处理状态
       // 证书是否免费  1-免费 2-付费
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
index 05aa28f..631449a 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue
@@ -199,7 +199,7 @@
                 rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" disabled
                 :maxLength="500"></a-textarea>
             </a-form-item>
-            <span style="color: #bfbfbf" v-show="!detailFlag && !checkFlag">一个缴费单可在多个缴费处上传</span>
+            <span class="remark-notice" style="color: #bfbfbf" v-show="!detailFlag && !checkFlag">一个缴费单可在多个缴费处上传</span>
           </a-col>
         </a-row>
 
@@ -865,7 +865,7 @@ export default {
   border-collapse: collapse;
 }
 
-.remark span {
+.remark .remark-notice {
   display: inline-block;
   font-size: 14px;
   //margin-left: 100px;
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index c931319..2bb9071 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -253,7 +253,7 @@
                 :maxLength="500"
                 :disabled="checkFlag||detailFlag"></a-textarea>
             </a-form-item>
-            <span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
+            <span class="remark-notice" style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
           </a-col>
         </a-row>
         <!--缴费 方式 费用类型end -->
@@ -553,7 +553,7 @@ export default {
         memberPaymentAmount: {
           rules: [
             {
-              required: true, message: '请输入会员缴费金额'
+              required: false, message: '请输入会员缴费金额'
             },
             {
               pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
@@ -1251,7 +1251,7 @@ export default {
   //margin-left: -100px;
 }
 
-.remark span {
+.remark .remark-notice {
   display: inline-block;
   font-size: 14px;
   margin-left: 145px;
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 57ac16c..3691b7a 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -1034,7 +1034,7 @@ export default {
             // 提示
             that.$confirm({
               title: '确认提交',
-              content: '是否删除选中数据?',
+              content: '当前已有待审核缴费订单，为避免重复提交，请确认是否再次提交缴费订单?',
               onOk:function () {
                 that.handleSubmit(values)
               },
diff --git a/src/views/standardsAssociation/model/BindMemberModel.vue b/src/views/standardsAssociation/model/BindMemberModel.vue
index d448338..58e3567 100644
--- a/src/views/standardsAssociation/model/BindMemberModel.vue
+++ b/src/views/standardsAssociation/model/BindMemberModel.vue
@@ -147,7 +147,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
index a451871..7f483fb 100644
--- a/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
+++ b/src/views/standardsAssociation/model/ChargeCertificateEditModel.vue
@@ -811,7 +811,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/ChargeCertificateModel.vue b/src/views/standardsAssociation/model/ChargeCertificateModel.vue
index 646db07..b2a0d79 100644
--- a/src/views/standardsAssociation/model/ChargeCertificateModel.vue
+++ b/src/views/standardsAssociation/model/ChargeCertificateModel.vue
@@ -813,7 +813,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/CheckCertificateModel.vue b/src/views/standardsAssociation/model/CheckCertificateModel.vue
index c9a2d5b..c2d20e0 100644
--- a/src/views/standardsAssociation/model/CheckCertificateModel.vue
+++ b/src/views/standardsAssociation/model/CheckCertificateModel.vue
@@ -263,7 +263,7 @@ export default {
   }
 }
 </script>
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/FreeCertificateEditModel.vue b/src/views/standardsAssociation/model/FreeCertificateEditModel.vue
index 44995ef..6ff3226 100644
--- a/src/views/standardsAssociation/model/FreeCertificateEditModel.vue
+++ b/src/views/standardsAssociation/model/FreeCertificateEditModel.vue
@@ -318,7 +318,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/FreeCertificateModel.vue b/src/views/standardsAssociation/model/FreeCertificateModel.vue
index d4d8668..2e4ee91 100644
--- a/src/views/standardsAssociation/model/FreeCertificateModel.vue
+++ b/src/views/standardsAssociation/model/FreeCertificateModel.vue
@@ -389,7 +389,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/FreeCertificateReplaceEditModel.vue b/src/views/standardsAssociation/model/FreeCertificateReplaceEditModel.vue
index 2d87282..10d3af5 100644
--- a/src/views/standardsAssociation/model/FreeCertificateReplaceEditModel.vue
+++ b/src/views/standardsAssociation/model/FreeCertificateReplaceEditModel.vue
@@ -421,7 +421,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
diff --git a/src/views/standardsAssociation/model/RenewChargeModel.vue b/src/views/standardsAssociation/model/RenewChargeModel.vue
index 583f73b..d87b47b 100644
--- a/src/views/standardsAssociation/model/RenewChargeModel.vue
+++ b/src/views/standardsAssociation/model/RenewChargeModel.vue
@@ -156,6 +156,7 @@
                   dictCode="invoice_requirements"
                   placeholder="请选择发票"/>
               </a-form-item>
+              <span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span>
             </a-col>
           </a-row>
           <!--只有电汇才会上传缴费凭证/付款说明-->
@@ -170,6 +171,7 @@
                   v-decorator="['paymentRecord',validatorRules.paymentRecord]"
                   ></j-image-upload>
               </a-form-item>
+              <span v-if="!validateCompanyNameFlag &&  currentSelectInvoiceType && currentSelectInvoiceType !== 0" class="paymentRecord-notice">需上传"垫付款说明（盖章"文件）</span>
             </a-col>
 
           </a-row>
@@ -180,6 +182,7 @@
                 <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
                     :maxLength="50"
+                    @blur="validateCompanyName"
                     v-decorator="['headerName',{ ...validatorRules.headerName,initialValue:currentMemberInfo.invoiceInfo}]"
                     placeholder="请输入付款单位发票抬头"></a-input>
                 </a-form-item>
@@ -325,10 +328,11 @@ export default {
       title: '续费',
       visible: false,
       confirmLoading: false,
+      validateCompanyNameFlag:false,// 验证单位名称与发票抬头是否一致
       pageType: 7,
       // 记录续费证书选择
       selectType: 1,
-      currentSelectInvoiceType: 0,
+      currentSelectInvoiceType: '',
       invoiceRequirementsFlag: false,
       form: this.$form.createForm(this),
       labelCol: {
@@ -540,6 +544,7 @@ export default {
       this.checkEffectDate = record.effectDate
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'paymentRecord', 'id', 'auditOpinion', 'address', 'postcode', 'mobile', 'liaisonMan', 'certificateValidDate', 'companyName', 'certificationDate', 'certificateType', 'applyDate', 'effectDate', 'invalidDate', 'certificateStatus', 'memberId', 'code', 'chargeType'))
+        this.validateCompanyName()
       })
     },
     // 校验是否选择 要发票
@@ -550,6 +555,11 @@ export default {
       } else {
         this.invoiceRequirementsFlag = false
       }
+      if(value === '2'){
+        this.validateCompanyName()
+      }
+
+
     },
     /* 缴费方式*/
     changePaymentMethod(value) {
@@ -562,6 +572,12 @@ export default {
         this.paymentMethodFlag = false
       }
     },
+    /**
+     * 校验发票抬头是否与公司名称一致
+     * */
+    validateCompanyName() {
+      this.validateCompanyNameFlag = this.form.getFieldValue('headerName') === this.renewMemberInfo.companyName
+    },
     /*
       * 续费选择换证
       * */
@@ -677,7 +693,7 @@ export default {
                 if (res.success) {
                   that.$message.success(res.message)
                   that.$emit('ok')
-                  that.close()
+                  that.handleCancel()
                 }
               })
             } else {
@@ -691,6 +707,7 @@ export default {
     },
     handleCancel() {
       this.visible = false
+      this.currentSelectInvoiceType = ''
     }
   },
   computed: {
@@ -708,7 +725,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .v-middle {
   height: 100px;
   text-align: center;
@@ -791,4 +808,20 @@ export default {
   left: 25%
 }
 
+
+.other-notice {
+  color: #f5222d;
+  position: absolute;
+  bottom: 10px;
+  left: 25%;
+}
+
+// 上传额外附件的缴费凭证
+.paymentRecord-notice {
+  color: #f5222d;
+  position: absolute;
+  bottom: 25px;
+  left: 25%
+}
+
 </style>
\ No newline at end of file