diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index e3610a4..931d72a 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -170,6 +170,10 @@ {{ otherCompanyInfo.bankAccount }} + + + {{ otherCompanyInfo.linkBankNumber || '' }} + diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index ad50206..ee74639 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -174,6 +174,7 @@ :project-id="selectProjectId" :project-type="selectProjectType" :need-invoice="selectNeedInvoice" + :can-add-stage="canAddStage" :visible.sync="arriveVisible"> @@ -409,6 +410,12 @@ export default { } }, + computed: { + // 批量来款是否可以新增阶段--会员缴费、证书缴费 不能新增阶段 + canAddStage() { + return Number(this.selectProjectType) !== 5 && Number(this.selectProjectType) !== 6 + } + }, methods: { getPayConfirmList, /** diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 0cefc55..a7df90c 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -80,7 +80,8 @@ @@ -96,6 +97,7 @@ import {amountReceivedList, revokeIncome} from '../../../../api/incomePaymentsAp import PreviewImgModal from '../../../../components/PreviewImgModal' import PreviewFile from '../../../../components/jero/PreviewFile.vue' import {ajaxGetDictItems} from '@api/api' +import { ProjectTypeEnums } from '../../../../enums/commonEnums' export default { name: 'ArriveStageModule', @@ -117,6 +119,22 @@ export default { type: [Number, String], required: false, default: null + }, + // 是否能增加阶段-从外部进行模块的区分 + canAddStage: { + type: Boolean, + required: false, + default: true + } + }, + computed: { + canAddStageFlag() { + // 标协会员项目和证书项目 需要判断 当前的阶段是否有值,这两类项目只能来款一次 + if(Number(this.projectType) === ProjectTypeEnums.STANDARD_CERTIFICATE_PRO.value || Number(this.projectType) === ProjectTypeEnums.STANDARD_MEMBER_PRO.value) { + return this.stageList.length === 0 && this.canAddStage + } else { + return this.canAddStage + } } }, data() {