From b5e963cfd1442463aa6f2fa1b21bfdae6b96e7d1 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 29 May 2023 09:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=88=B0=E8=B4=A6?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArriveAndInvoivingList.vue | 35 +++++++++++++++++-- .../packManagement/PackProjectMaintenance.vue | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 3438d68..83b2bd9 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -160,6 +160,9 @@ v-has="'incomePaymentAndInvoiving:invoicing'">开票 确认收入 + + 开票类型 + @@ -208,6 +211,16 @@ :project-type="selectProjectType" :visible.sync="confirmStageVisible" > + + + + + @@ -229,13 +242,14 @@ import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal' import ConfirmStageModule from './modules/ConfirmStageModule' import {getPayConfirmList} from '../../../api/incomePaymentsApi' import JDictSelectTag from '@comp/dict/JDictSelectTag' +import InvoiceInfoChangeModule from '../../packManagement/modules/InvoiceInfoChangeModule' // 项目类型 数据字典 的定义 和数据库的保持一致 const ProjectTypeEnums = { GENERAL_PRO: {name: '普通项目', value: 1}, GROUP_PRO: {name: '工作组项目', value: 2}, MEETING_PRO: {name: '会议项目', value: 3}, - MEMBER_PRO: {name: '会员项目', value: 4}, + MEMBER_PRO: {name: '资料网员', value: 4}, STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5}, STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6}, } @@ -255,7 +269,8 @@ export default { BatchInvoicingModule, AuditProofModule, AuditModal, - ConfirmStageModule + ConfirmStageModule, + InvoiceInfoChangeModule }, mixins: [JeroListMixin], data() { @@ -369,7 +384,7 @@ export default { dataIndex: 'action', align: 'center', fixed: 'right', - width: 250, + width: 300, scopedSlots: {customRender: 'action'} } ], @@ -581,6 +596,20 @@ export default { } return } + }, + /** + * 开票类型-修改开票类型,只有工作组项目、普通项目、资料网员项目可以修改 + * @param record + */ + changeInvoiceInfo(record) { + // 二次判断 + if (Number(record.projectType) !== ProjectTypeEnums.GENERAL_PRO.value && Number(record.projectType) !== ProjectTypeEnums.GROUP_PRO.value && Number(record.projectType) !== ProjectTypeEnums.MEMBER_PRO.value) return + this.selectProjectType = record.projectType + this.selectProjectId = record.id + record.companyId = record.chargeCompanyId + // this.confirmStageVisible = true + this.$refs.changeInvoiceInfo.open(record) + } } } diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 9c09ca9..fc2f724 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -616,6 +616,8 @@ export default { * @param record */ changeInvoiceInfo(record) { + // 二次判断 + if (Number(record.projectType) !== ProjectTypeEnums.GENERAL_PRO.value && Number(record.projectType) !== ProjectTypeEnums.GROUP_PRO.value && Number(record.projectType) !== ProjectTypeEnums.MEMBER_PRO.value) return this.selectProjectType = record.projectType this.selectProjectId = record.id record.companyId = this.companyDataById.companyId