diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 334c52e..ca1a5d2 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -340,8 +340,8 @@ export default { */ invoicing(record) { // 标协会员项目必须先到账后开票 - if (record.projectType === 5 && record.inAccount !== 1) { - this.$message.warn('标协会员项目必须先到账才可开票。') + if ((Number(record.projectType) === 5 || Number(record.projectType) === 6) && record.paymentStatus !== 'completed') { + this.$message.warn(`标协${Number(record.projectType) === 5 ? '会员' : '证书'}项目必须先审核通过才可开票。`) return } this.mailContactsId = record.mailContactsId diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue index 9281ee9..0d130ef 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -57,7 +57,7 @@ export default { }, // 项目类型 projectType: { - type: Number, + type: [Number, String], required: false, default: null }, diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 090bdb5..2942fab 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -52,10 +52,10 @@ - + @@ -81,6 +81,12 @@ export default { type: Boolean, required: false, default: false + }, + // 项目类型,标协会员、证书项目不可来款,来款的添加阶段按钮隐藏 + projectType: { + type: [Number, String], + required: false, + default: null } }, data() {