【bug】 标协会议增加筛选条件 收入合同消息修改

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="请选择年份"

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',