From cde2a036d97a435ac0cdc74386a80ca468c4bdd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Mon, 20 Nov 2023 09:45:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/WorkCenterMixin.js | 1 + .../StandardConsultationProcess.vue | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js index 6610bf03..5c0193a1 100644 --- a/src/mixins/WorkCenterMixin.js +++ b/src/mixins/WorkCenterMixin.js @@ -30,6 +30,7 @@ export const WorkCenterMixin = { if (!this.$route.query.processInstanceId) { // 说明是在新发起一个节点,初始化发起人员信息 this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id + this.personnelInfoData[0].linkUserIds_dictText = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' } if (callback) { diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 1982a28a..bfa4c341 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -760,17 +760,14 @@ export default { } }, created () { - // 有流程id或者草稿id点进来的 if (this.$route.query.processInstanceId || this.$route.query.draftId) { this.currentNode = this.$route.query.nodeId this.initProcessDetailData() - } else { - this.currentNode = ConsultationProcess.initiate.value } // 获取人员信息数据 this.getPersonInfoStructure(ProcessKey.CONSULTATION.value, () => { - this.initPersonInfoData(this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0) + this.initPersonInfoData(!this.currentNode || this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0) }) // 找不到这个节点默认使用审批节点页面及按钮,发起除外 this.nodeEnumsKey = this.currentNode ? ConsultationProcess.keyOfValue(this.currentNode) || 'regulatoryEngineerApproval' : 'initiate' @@ -1027,7 +1024,12 @@ export default { return } this.loading = true - const func = !!this.currentNode ? submitConsultationProcess : initiateConsultationProcess + let func + if (!this.currentNode || (this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0 && !this.$route.query.processInstanceId)) { + func = initiateConsultationProcess + } else { + func = submitConsultationProcess + } func(formData).then(res => { if (res.success) { this.$message.success(res.message)