From f679e880534762c061de1e131a1f78c66ba94f9f Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 13 Jan 2022 10:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E=20=E5=A2=9E=E5=8A=A0standa?=
 =?UTF-8?q?rdsId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/AddOrDetailMeet.vue | 15 ++++++++++++++-
 src/views/projectManagement/CommitteeMeeting.vue  |  7 ++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 2b49a47..cf4781d 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -520,6 +520,14 @@ export default {
       } else {
         return false
       }
+    },
+    // 是否是 标协项目 会议
+    isStandardsId(){
+      if (this.$route.query.standardsId) {
+        return true
+      } else {
+        return false
+      }
     }
   },
   mounted() {
@@ -638,7 +646,7 @@ export default {
           }
           let placeName = values.convokeLocale
           const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
-          // 如果会议的费用未为0 不能上传缴费凭证
+          // 如果会议的费用为0 不能上传缴费凭证
           if (values.meetingCosts === '0.00') {
             delete formData.paymentQrCode
           }
@@ -660,6 +668,11 @@ export default {
             formData.councilId = this.$route.query.councilId
             formData.councilName = this.$route.query.connccilName
           }
+          // 如果是 标准协会会议 需要加入 standardsId
+          if (this.isStandardsId) {
+            formData.meetingType = '2'
+            formData.standardsId = this.$route.query.standardsId
+          }
           // 转换召开时间
           formData.startTime = this.newConvokeTime[0]
           formData.endTime = this.newConvokeTime[1]
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index ef3af17..d5aecff 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -350,6 +350,10 @@ export default {
     caseCommitteeId() {
       return this.$route.query.id ? this.$route.query.id : undefined
     },
+    // 标协项目id
+    standardsId(){
+      return this.$route.query.id ? this.$route.query.id : undefined
+    },
     // eslint-disable-next-line
     url() {
       let meetingType = this.$route.query.meetingType + ''
@@ -393,7 +397,8 @@ export default {
         this.$router.push({
           path: '/incomePayments/meetManage/AddOrDetailMeet',
           query: {
-            meetingType: this.meetingType
+            meetingType: this.meetingType,
+            standardsId:this.standardsId
           }
         })
       }