From 4187f91989821a7c2fcd64821d2d990f38ae65b2 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 13 Sep 2021 15:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../incomePayments/meetManage/Attendance.vue | 21 +++--- .../meetManage/modules/BatchInvocieModal.vue | 71 ++++++++++++++----- 2 files changed, 66 insertions(+), 26 deletions(-) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 54535a3..e525e8c 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -67,7 +67,8 @@ {{ currentMeetingInfo.cooperativeInvitationCode }} - + @@ -159,7 +160,8 @@ 添加参会人 导出 批量删除 - 合并开票 + + 合并开票 设置对接人 @@ -198,8 +200,10 @@ - 审核 + + 审核 编辑 + 删除 @@ -437,25 +441,26 @@ export default { this.$message.warn('请选择一条记录') return } + // 只能选择相同的单位进行合并开票 if (this.selectionRows.length > 0) { // 一个数据不做判断 if (this.selectionRows.length === 1) { // 打开模态框 - this.$refs.batchInvoiceModal.open() + this.$refs.batchInvoiceModal.open(this.selectionRows) } else { - let initName = this.selectionRows[0].name + let initName = this.selectionRows[0].companyId // 单位判重 let flag = this.selectionRows.some(item => { - return item.name !== initName + return item.companyId !== initName }) if (flag) { // flag为true 说明有单位不一样 this.$message.warn('请选择同一企业的参会人进行开票') return } else { - // 打开模态框 要传一个参数 - this.$refs.batchInvoiceModal.open() + // 打开模态框 + this.$refs.batchInvoiceModal.open(this.selectionRows) } } } diff --git a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue index 58f852a..357b58a 100644 --- a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue +++ b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue @@ -15,8 +15,9 @@ @@ -27,7 +28,7 @@ @@ -37,7 +38,7 @@ @@ -46,8 +47,9 @@ @@ -64,6 +66,8 @@