diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index a2e046905..9d714ddac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -613,7 +613,6 @@ export default { idList += item.id; nameList += item.name; }); - console.log(this.type) if (this.type === 'feeUser') { this.roleForm.feeUser = nameList this.roleForm.feeUserId = idList diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 068ef9cec..9e1605eea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -334,7 +334,7 @@ export default { let json = { member: this.selfUser, passFlag: '0', - engineerSum: this.roleForm.startUser, + roleList: this.roleForm, commentText: this.textarea, rh_pageData: this.rh_pageData, } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 73e688bc4..b82f77cb2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -348,6 +348,39 @@ export default { }, // 退回按钮 handleSubmitNo() { + let json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } + if (this.taskInfo === '标准法规部主管领导审核') { + json.passFlag = '0', + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.passFlag = '0', + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.passFlag = '0', + json.engineerSumDone = this.roleForm.startUser + } else { + json = json + } + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) }, // 提交按钮 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index bb98c0b53..6b6f87bfc 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -988,7 +988,7 @@ export default { prcType: row.prcType } }) - } else if ('标准法规工程师汇总修订'){ + } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){ this.$router.push({ name: 'bzrhStep6', query:{ diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 1673f66fb..21d8ebce5 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -389,6 +389,16 @@ export default { } }) break + case '20': + this.$router.push({ + name: 'bzrhStep1', + query: { + type: '20', + processName: '外部标准化协会入会流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']),