From c887b19685233be76ee47dfca78796f68b071536 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 24 Dec 2021 09:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=20=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectManagement/CommitteeMeeting.vue | 9 +++++++++
 src/views/system/UserAnnouncementList.vue        | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index e4db891..33138a6 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -28,6 +28,15 @@
                 </j-date>
               </a-form-item>
             </a-col>
+<!--            标协会议类型 -->
+            <a-col :xl="7" :lg="8" :md="8" :sm="24" v-if="$route.query.meetingType === '2' ">
+              <a-form-item label="会议类型">
+                <j-dict-select-tag style="width: 100%"
+                                   dict-code="standard_meeting_type"
+                                   v-model="queryParam.tbMeetingType"
+                                   placeholder="请选择会议类型"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择年份"
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index d6892aa..561709a 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -253,7 +253,7 @@ export default {
       } else if(record.openType === 'url') {
         console.log(record.openPage,'url')
         const param = JSON.parse(record.busId)
-        if(Object.prototype.hasOwnProperty.call(param, 'contractType') && param.contractType === 2){
+        if(Object.prototype.hasOwnProperty.call(param, 'contractType') && Number(param.contractType) === 1){
           // 如果是支出合同的就去支出合同 多加一个判断 是不想再去新加一个消息模板
           this.$router.push({
             path:'/contractManagement/ExpenditureContractDetail',