From d10a328df33b6f0ba500ad2e3ef29d5f9f56004e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 7 Dec 2022 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/CombinationPaymentModal.vue           | 15 +++++++++++++--
 .../PaymentInfo/modules/PaymentInfoModal.vue      | 14 ++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index e4222b6..7cd3e49 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -631,8 +631,8 @@ export default {
           rules: [{ required: false, message: '请选择失效日期' }],
           validateTrigger: ['blur', 'change']
         },
-        paymentRecord: { rules: [{ required: true, message: '请上传缴费凭证/付款说明' }] },
-        paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
+        paymentRecord: { rules: [{ required: false, message: '请上传缴费凭证/付款说明' }] },
+        paymentRecord1: { rules: [{ required: false, message: '请上传打包协议' }] },
         headerName: {
           rules: [
             { required: true, message: '请输入付款单位发票抬头', validateTrigger: 'blur' },
@@ -947,6 +947,17 @@ export default {
       // 触发表单验证
       that.form.validateFields(async(err, values) => {
         if (!err) {
+          // 校验缴费凭证 或打包协议必填
+          if(this.paymentMethodFlag && !values.paymentRecord){
+            // 选择了打包协议
+            this.$message.warning('请上传打包协议')
+            return
+          }
+          if(!this.paymentMethodFlag && !values.paymentRecord) {
+            this.$message.warning('请上传缴费凭证/付款说明')
+            return
+          }
+
           // 校验会员缴费与证书缴费 至少填写一种
           if(this.validatePayment()){
             this.$message.warning('请至少填写会员缴费金额与证书缴费金额中的一种')
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index fb6d9a1..6a7ca66 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -618,8 +618,8 @@ export default {
           rules: [{ required: true, message: '请选择缴费日期' }],
           validateTrigger: ['blur', 'change']
         },
-        paymentRecord: { rules: [{ required: true, message: '请上传缴费凭证/付款说明' }] },
-        paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
+        paymentRecord: { rules: [{ required: false, message: '请上传缴费凭证/付款说明' }] },
+        paymentRecord1: { rules: [{ required: false, message: '请上传打包协议' }] },
         headerName: {
           rules: [
             { required: true, message: '请输入付款单位发票抬头', validateTrigger: 'blur' },
@@ -1044,6 +1044,16 @@ export default {
       // 触发表单验证
       that.form.validateFields({ force: true }, async (err, values) => {
         if (!err) {
+          // 校验缴费凭证 或打包协议必填
+          if(this.paymentMethodFlag && !values.paymentRecord){
+            // 选择了打包协议
+            this.$message.warning('请上传打包协议')
+            return
+          }
+          if(!this.paymentMethodFlag && !values.paymentRecord) {
+            this.$message.warning('请上传缴费凭证/付款说明')
+            return
+          }
           // 判断会员是否有未审核的缴费
           let flag  = await this.judgeMemberNotApproveFunc(this.memberId)
           if(flag === 'true' ){