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 @@ {{ currentMeetingInfo.estimatedNumber }} - {{ currentMeetingInfo.hotelName }} + {{ currentMeetingInfo.hotelName }} {{ currentMeetingInfo.hotelAddress }} 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 @@ @@ -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') {