diff --git a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue index 89862f67..b443a2fa 100644 --- a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue +++ b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue @@ -336,6 +336,10 @@ export default { id: this.formInfo.id }) + // 第二个节点将文件id提到外层 + if (this.currentNode === PostMeetingManage.attendeesUploadMaterials.value) { + params.fileIds = params.processMeetingManage.fileIds + } return params }, /** @@ -392,8 +396,8 @@ export default { */ handleSubmit () { if (this.loading) return - // 发起流程并且没有被驳回,调发起接口,否则调审批接口 - if (!(this.currentNode === PostMeetingManage.initiate.value && this.$route.query.taskId)) { + // 发起流程并且没有被驳回,调发起接口 + if (this.currentNode !== PostMeetingManage.initiate.value) { this.handleAgree() return } @@ -422,6 +426,30 @@ export default { this.loading = true this.getPageParams().then(res => { res.map.pass = true + res.notAttend = false + return approvalPostMeetingManage(res) + }).then(res => { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warn(res.message) + } + }).catch((err) => { + this.switchChange(err.message) + }).finally(() => { + this.loading = false + }) + }, + /** + * 未参加 + */ + handleUncommitted () { + if (this.loading) return + this.loading = true + this.getPageParams().then(res => { + res.map.pass = true + res.notAttend = true return approvalPostMeetingManage(res) }).then(res => { if (res.success) { diff --git a/src/views/workCenter/postMeetingManageProcess/modules/BaseInfoForm.vue b/src/views/workCenter/postMeetingManageProcess/modules/BaseInfoForm.vue index d09fe3d7..f6d0e2f7 100644 --- a/src/views/workCenter/postMeetingManageProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/postMeetingManageProcess/modules/BaseInfoForm.vue @@ -101,7 +101,7 @@ - + {{ (formInline.fileIds === 'null' || formInline.fileIds === '' || formInline.fileIds === null || formInline.fileIds === undefined) ? $t('uploadFile.clickUpload') @@ -113,7 +113,7 @@ - + @@ -200,6 +200,10 @@ export default { console.log(res) this.treeData = res.result.children || [] this.subStandardizationCommitteeList.push(...this.treeData) + // 下拉菜单请求回来回显数据 + if (this.model.standardizationFirstId && this.treeData.length) { + this.workGroupList = (this.treeData.find(item => item.id === this.model.standardizationFirstId)).children + } } }) }, @@ -212,6 +216,9 @@ export default { // 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了 initData (data) { this.model = Object.assign({}, data) + if (this.model.standardizationFirstId && this.treeData.length) { + this.workGroupList = (this.treeData.find(item => item.id === this.model.standardizationFirstId)).children + } // 给表单赋值 this.formInline = { ...data