From cecf36d9fd1aa253131d5b441fd556485b027f89 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 6 Jan 2022 09:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/AddOrDetailMeet.vue   | 2 +-
 src/views/incomePayments/meetManage/Attendance.vue        | 2 +-
 .../memberManage/CertificateMaintenanceList.vue           | 8 ++------
 src/views/projectManagement/CommitteeMeeting.vue          | 1 +
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index bcf089e..48089ec 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -926,7 +926,7 @@ export default {
       let codeObj = this.form.getFieldsValue(['cooperativeInvitationCode', 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode'])
       let codeArr = Object.values(codeObj)
       codeArr = codeArr.filter(item => {
-        return (item !== undefined && item !== '')
+        return (item !== undefined && item !== '' && item !== null)
       })
       console.log('codearr', codeArr)
       // 校验是否重复
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 9e77512..d3292cb 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -48,7 +48,7 @@
           <label>预计参加人数：</label><span>{{ currentMeetingInfo.estimatedNumber }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>酒店名称</label><span>{{ currentMeetingInfo.hotelName }}</span>
+          <label>酒店名称：</label><span>{{ currentMeetingInfo.hotelName }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>酒店地址：</label><span>{{ currentMeetingInfo.hotelAddress }}</span>
diff --git a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
index dcce9d4..7e5c2f3 100644
--- a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
@@ -21,9 +21,9 @@
             <template >
               <a-col :xl="10" :lg="11" :md="12" :sm="24">
                 <a-form-item label="缴费时间">
-                  <j-date  date-format="YYYY-MM-DD 00:00:00" placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.submissionTimeBegin" :disabled-date="disabledStartDate"></j-date>
+                  <j-date  date-format="YYYY-MM-DD 00:00:00" placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.submissionTime_begin" :disabled-date="disabledStartDate"></j-date>
                   <span class="query-group-split-cust"></span>
-                  <j-date  date-format="YYYY-MM-DD 23:59:59" placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.submissionTimeEnd" :disabled-date="disabledEndDate"></j-date>
+                  <j-date  date-format="YYYY-MM-DD 23:59:59" placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.submissionTime_end" :disabled-date="disabledEndDate"></j-date>
                 </a-form-item>
               </a-col>
             </template>
@@ -83,10 +83,6 @@
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
-          :rowSelection="{
-          selectedRowKeys: selectedRowKeys,
-          onChange: onSelectChange,
-        }"
           class="j-table-force-nowrap"
           @change="handleTableChange"
         >
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 3b6ddc5..e4b705c 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -313,6 +313,7 @@ export default {
     // 如果是标协会议 用标协会议权限
     if (this.meetingType === '2') {
       this.authorCode = Object.assign({}, this.standardsMeetingAuthorCode)
+      this.filters.standardsId = this.$route.query.id
     }
     // 不是分标委会议去掉提醒字段
     if (this.meetingType !== '5') {