From 778935053f4483c081930063d15e358579bd1d3a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 10 Nov 2022 15:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=99=90=E5=88=B6=20=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E7=9A=84=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardsAssociation/PaymentInfo/MemberInfo.vue    |  2 +-
 .../PaymentInfo/modules/CombinationPaymentModal.vue    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
index aacb8c1..1993b64 100644
--- a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
@@ -322,7 +322,7 @@ export default {
               dataIndex: 'companyName'
             },
             {
-              title: '会员类型s',
+              title: '会员类型',
               align: 'center',
               dataIndex: 'paymentType_dictText'
             },
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index 66b8160..e4222b6 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -1029,6 +1029,16 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          // 校验会员缴费与证书缴费 至少填写一种
+          if(this.validatePayment()){
+            this.$message.warning('请至少填写会员缴费金额与证书缴费金额中的一种')
+            return
+          }
+          // 校验合计金额 与凭证金额是否一致
+          if (!this.validateAllMoney()) {
+            this.$message.warning('合计金额与凭证金额不一致')
+            return
+          }
           that.confirmLoading = true
           let httpurl = ''
           let method = ''