diff --git a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue index 49f061a..e664fd2 100644 --- a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue +++ b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue @@ -274,7 +274,7 @@ export default { this.$router.push({ path: '/projectManagement/WorkingGroupProjectDataMaintenance', query: { - id: record.id + councilId: record.id } }) }, diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index 1fb6ca8..a7f650b 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -164,7 +164,7 @@ export default { // 工作组 if (this.$route.query.hasOwnProperty.call(this.$route.query, 'workingGroupId')) { this.filters.projectId = this.$route.query.workingGroupId - this.canOperate = this.$route.query.canOperate === 'true' ? true : false + this.canOperate = this.$route.query.canOperate === 'true' this.projectType = 1 this.filters.projectType = 1 } else if (this.$route.query.hasOwnProperty.call(this.$route.query, 'id')) { @@ -172,6 +172,11 @@ export default { this.filters.projectId = this.$route.query.id this.projectType = 2 this.filters.projectType = 2 + } else if (this.$route.query.hasOwnProperty.call(this.$route.query, 'councilId')) { + // 理事会 + this.filters.projectId = this.$route.query.councilId + this.projectType = 3 + this.filters.projectType = 3 } this.projectId = this.filters.projectId this.loadData() diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue index 26eb84f..49d22c6 100644 --- a/src/views/projectManagement/WorkingGroupProjectManagement.vue +++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue @@ -322,7 +322,16 @@ export default { id: record.id } }) - } + }, + /** + * 重写编辑 + * @param record + */ + handleEdit(record) { + this.$refs.modalForm.edit(record) + this.$refs.modalForm.title = '基本信息维护' + this.$refs.modalForm.disableSubmit = false + }, } } diff --git a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue index ec46cb6..8dc5448 100644 --- a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue +++ b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue @@ -42,7 +42,7 @@ export default { required: false, default: '' }, - // 项目类型:1--工作组;2--分标委 + // 项目类型:1--工作组;2--分标委;3--理事会 projectType: { type: Number, required: false, diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index b0939c9..fb1699b 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -239,6 +239,9 @@ export default { }, edit(record) { this.form.resetFields() + // 防止下拉选项出现问题 + record.principalIdA = record.principalIdA || undefined + record.principalIdB = record.principalIdB || undefined this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => {