From 5e47fed642ea17a2a241349d0b95f0fd17b5038e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 22 Sep 2021 10:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=A0=87=E5=A7=94=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E6=8E=A5=E5=8F=A3=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   | 13 +++++++++++++
 src/views/projectManagement/CommitteeMeeting.vue    | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 778bd24..bdf03bc 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -463,6 +463,14 @@ export default {
         return true
       }
     },
+    // 是否从分标委会议维护来的
+    isCaseCommitteeId() {
+      if (this.$route.query.caseCommitteeId) {
+        return false
+      } else {
+        return true
+      }
+    },
   },
   mounted() {
     this.pcaData = new AreaPca()
@@ -568,6 +576,11 @@ export default {
             formData.meetingType = '1'
             formData.workingGroupId = this.$route.query.workingGroupProjectId
           }
+          // 如果是分标委会议需要加上分标委id与会议类型
+          if (!this.isCaseCommitteeId) {
+            formData.meetingType = '5'
+            formData.caseCommitteeId = this.$route.query.caseCommitteeId
+          }
           // 转换召开时间
           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 dad6e94..daaf3ac 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -245,6 +245,10 @@ export default {
   },
   created() {
     this.filters.meetingType = this.meetingType
+    // 分标委会议需要加上分标委id
+    if(this.meetingType === '5'){
+      this.filters.caseCommitteeId = this.caseCommitteeId
+    }
     this.loadData(1)
     // 不是分标委会议去掉提醒字段
     if (this.meetingType !== 5) {
@@ -261,6 +265,10 @@ export default {
     // 会议类型
     meetingType() {
       return this.$route.query.meetingType + ''
+    },
+    // 分标委id
+    caseCommitteeId(){
+      return this.$route.query.id ? this.$route.query.id : undefined
     }
   },
   methods: {
@@ -272,7 +280,8 @@ export default {
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
-          meetingType:this.meetingType
+          meetingType:this.meetingType,
+          caseCommitteeId:this.caseCommitteeId
         }
       })
     },