diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue index 04996c7..d75e194 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue @@ -37,7 +37,6 @@ @@ -47,7 +46,6 @@ @@ -195,8 +193,6 @@ export default { }, // 合同信息 contractInfo:{}, - // 联系人回显 - selectContact:null, // 不包含在列表的会员项目 memberProjetList:[], } @@ -210,7 +206,7 @@ export default { this.contractInfo = Object.assign({},record) // 会员企业的默认显示 this.contractInfo.companyId = { - id:record.signedCompanyTemporaryId, + id:record.signedCompanyId, companyName:record.signedCompanyTemporaryName } // 查询会员项目的企业id @@ -223,10 +219,6 @@ export default { this.contractInfo.postContactId = record.signedContactsId // 合同编号显示 this.contractInfo.contractNo = record.contractNum - this.selectContact = { - id:record.signedContactsId, - name:record.signedContactsTemporaryName - } this.$nextTick( () => { this.form.setFieldsValue(pick(this.contractInfo,'companyId','companyContactId','postContactId','contractNo')) }) diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 1a09132..2c836c0 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -796,6 +796,11 @@ export default { // 会议项目 case 3: // 传入合同信息 + // 打包为是不能选择关联会议项目 + if(this.newFormData.pack === 1){ + this.$message.warn('打包不可选择会议项目') + return + } this.$refs.selectMeetingProjectModule.open(this.newFormData) break // 会员项目