diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 161e48d..90cd0b8 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -790,24 +790,32 @@ export default { * @param type */ selectProjectTypeOk(type) { - let title = '' switch (type) { // 普通项目 case 1: this.$refs.selectProjectModule.columns = generalProjectColumns - this.getUserDetailByUserId() - this.$refs.selectProjectModule.filters = { - chargeCompanyId: this.selectedCompany.id, - pack: this.model.pack, - // contractId: this.contractId - } - this.$refs.selectProjectModule.url.list = this.url.generalProjectList - title = '普通项目列表' - this.$refs.selectProjectModule.pack = this.model.pack - this.$refs.selectProjectModule.contractId = this.model.id - this.$refs.selectProjectModule.projectType = type - this.$refs.selectProjectModule.title = title - this.$refs.selectProjectModule.open() + this.getUserDetailByUserId().then(res => { + console.log(res) + // 混入筛选条件 + this.$refs.selectProjectModule.filters = { + chargeCompanyId: this.selectedCompany.id, + contractId: this.contractId, + departId: res.split(',')[0] + } + this.$refs.selectProjectModule.queryParam.departId = res.split(',') + // 获取数据list + this.$refs.selectProjectModule.url.list = this.url.generalProjectList + // 打包状态 + this.$refs.selectProjectModule.pack = this.model.pack + // 合同id + this.$refs.selectProjectModule.contractId = this.model.id + // 项目类型 + this.$refs.selectProjectModule.projectType = type + // 标题 + this.$refs.selectProjectModule.title = '普通项目列表' + // 打开弹窗 + this.$refs.selectProjectModule.open() + }) break // 工作组项目 case 2: @@ -819,9 +827,8 @@ export default { this.$refs.selectProjectModule.pack = this.model.pack this.$refs.selectProjectModule.contractId = this.model.id this.$refs.selectProjectModule.projectType = type - this.$refs.selectProjectModule.title = title + this.$refs.selectProjectModule.title = '工作组项目列表' this.$refs.selectProjectModule.open() - title = '工作组项目列表' break // 会议项目 case 3: @@ -842,8 +849,10 @@ export default { let param = { id: this.model.principalId } - queryUserByDepartId(param).then(res => { - console.log(res) + return new Promise(resolve => { + queryUserByDepartId(param).then(res => { + resolve(res.result[0].departIds) + }) }) }, /**