From a20d8c65bcaaec3393883ff72ddd584598445d0d Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sun, 26 Sep 2021 16:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/HeaderNotice.vue           |  2 ++
 .../meetManage/AddOrDetailMeet.vue              | 17 ++---------------
 .../modules/PublishRemindModal.vue              | 12 +++++++++---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 2cac9ed..fd509f4 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -6,6 +6,7 @@
     :arrowPointAtCenter="true"
     overlayClassName="header-notice-wrapper"
     @visibleChange="handleHoverChange"
+    :visible="hovered"
     :overlayStyle="{ width: '300px', top: '50px' }">
     <template slot="content">
       <a-spin :spinning="loadding">
@@ -169,6 +170,7 @@
         this.$router.push({
           path: '/isps/userAnnouncement'
         })
+        this.handleHoverChange(false)
       },
       modalFormOk(){
       },
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 8098157..148e8d3 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -8,7 +8,6 @@
           <div class="item-title">会议信息</div>
 
           <a-row :gutter="24">
-
             <!--如果是工作组项目的会议维护跳转的 需要隐藏会议类型-->
             <!--            会议拆分不需要会议类型了 需要在调接口的时候传相应的会议类型-->
             <!--            <a-col :xxl="8" :xl="12" :sm="24" v-if="isWorkGroupMeetType">-->
@@ -51,18 +50,6 @@
 
 
             <!--工作组会议才有-->
-            <a-col :xxl="8" :xl="12" :sm="24" v-if="meetingType === '1' ">
-              <a-form-item label="工作组" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-select placeholder="请选择工作组"
-                          v-decorator="['workingGroupId',validatorRules.parentId]"
-                          :maxLength='50'>
-                  <a-select-option v-for="item in workGroupList" :key="item.id" :value="item.id">
-                    {{ item.workingGroupProject }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-
 
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -99,7 +86,6 @@
               </a-form-item>
             </a-col>
 
-
           </a-row>
 
           <a-row>
@@ -717,7 +703,8 @@ export default {
         callback(new Error('请输入邀请码'))
       } else {
         let codeObj = this.form.getFieldsValue(['cooperativeInvitationCode', 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode'])
-        const codeArr = Object.values(codeObj)
+        let codeArr = Object.values(codeObj)
+        codeArr = codeArr.filter(item => item !== undefined)
         console.log('codearr', codeArr)
         // 校验是否重复
         if (isRepeat(codeArr)) {
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index 1b7b90e..05bb6cc 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -65,6 +65,7 @@
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import {publishRemind} from '@api/incomePaymentsApi'
 
+
 export default {
   name: 'PublishRemindModal',
   mixins: [JeroListMixin],
@@ -105,7 +106,7 @@ export default {
           title: '是否提醒',
           align: 'center',
           width: 200,
-          dataIndex: '',
+          dataIndex: 'remind',
           // scopedSlots: {customRender: 'text'}
         },
       ],
@@ -129,13 +130,18 @@ export default {
   },
   methods: {
     open(meetingList) {
-
-
       this.visible = true
       // 保存选中的会议
       this.selectedMetingList = [...meetingList]
       // 列表需要工作组id参数
       this.filters.workingGroupId = this.$route.query.workingGroupProjectId
+      // 发布提醒需要会议id  只有选择一个会议的时候 才会有这个参数
+      if(meetingList.length === 1) {
+        this.filters.workingGroupId = this.$route.query.workingGroupProjectId
+        // 去掉列表的提醒字段
+        let index = this.columns.findIndex(item => item.dataIndex === 'remind')
+        this.columns.splice(index,1)
+      }
       this.searchReset()
     },
     close() {