From 4a5fc9f0f469f338482a4889df2c789b8b571204 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 17 Oct 2023 10:24:53 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 2 +- src/views/workCenter/NewProcess.vue | 8 ++--- .../PlanApprovalChangeFlow.vue | 29 +++++++++---------- .../processCenter/table/TodoList.vue | 3 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 7908b513..93868a77 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -11,7 +11,7 @@ const deleteFlowNode = (params) => postAction('/activitiModel/deleteTask', param // 企标计划立项、变更流程相关 // 转办 -const enterprisePlanApprovalTurnTo = (params) => postAction('', params) +const enterprisePlanApprovalTurnTo = (params) => postAction('/process/es/initChange/transfer', params) // 同意 const enterprisePlanApprovalAgree = (params) => postAction('', params) // 驳回 diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index d10e5f11..0be4afad 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -1,11 +1,11 @@ diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index f0ea2cb3..19fb2b27 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -569,7 +569,7 @@ export default { } }, methods: { - // 根据流程id获取数据 + // 根据流程id获取数据并回显 getProcessData (processId) { getProcessDataById({ processInstanceId: processId }).then(res => { if (res.success) { @@ -631,7 +631,6 @@ export default { }) }) } - console.log(res.result) } else { this.$message.warning(res.message) } @@ -641,7 +640,7 @@ export default { switchChange (value) { this.switchValue = value }, - // 流程名称修改 + // 业务基本信息组件中获取到流程名称改变后的值 processNameChange (value) { const param = { processName: value } this.$nextTick(() => { @@ -671,7 +670,6 @@ export default { let approvalBaseInfo = {} if (this.$refs.approvalBaseInfo) { approvalBaseInfo = this.$refs.approvalBaseInfo.formInline - console.log(approvalBaseInfo.enStandardSystem) // 企标体系处理成逗号分隔 if (approvalBaseInfo.enStandardSystem && approvalBaseInfo.enStandardSystem.length > 0) { approvalBaseInfo.enStandardSystem = approvalBaseInfo.enStandardSystem.map(item => item.value).join(',') @@ -742,16 +740,14 @@ export default { return } } - // 是节点一的保存,保存到草稿 - if (this.currentNode === 1) { - enterprisePlanApprovalSave(arr).then(res => { - if (res.success) { - this.$message.success(res.message) - } else { - this.$message.warning(res.message) - } - }) - } + // 保存到草稿 + enterprisePlanApprovalSave(arr).then(res => { + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }) }, // 节点一时候的提交,发起立项变更申请(业务基本信息那里是表格的就穿给后端数组里多条数据,是表单的就在数组里放一条数据) handleStart () { @@ -904,8 +900,9 @@ export default { this.loading = true let param = {} param = Object.assign({}, values) - param.userIds = userIds - param.processId = this.model.id + param.userId = userIds + // param.taskId = this.model[0].id + param.taskId = this.$route.query.taskId enterprisePlanApprovalTurnTo(param).then(res => { if (res.success) { this.$message.success(res.message) diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 222286ee..0150d2ab 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -148,7 +148,8 @@ export default { path: path, query: { currentNode: record.currentNode, - processId: record.prcId // 流程id + processId: record.prcId, // 流程id + taskId: record.taskId } }) },