From 5594eed40cf5f5abf668fb045bc003ee63cf6ec5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 10 二月 2025 09:29:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/send/index.vue | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index ac1ecaa..c24832c 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -19,8 +19,8 @@
<el-button size="small" type="primary" :disabled="submitLoading" v-loading="submitLoading" @click="submitForm">纭骞舵彁浜�</el-button>
<el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
<el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
- <el-button v-if="formDataObj.canJump" size="small" type="primary" @click="openDelegation()">璺宠繃</el-button>
- <el-button v-if="formDataObj.canWait" size="small" type="primary" @click="openDelegation()">瀹圭己</el-button>
+ <el-button v-if="formDataObj.canJump" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
+ <el-button v-if="formDataObj.canWait" size="small" type="primary" >瀹圭己</el-button>
</div>
<div class="current">褰撳墠闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div>
</div>
@@ -175,7 +175,7 @@
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
import {rejectTask} from "@/api/flowable/process";
-import {taskDelegation} from "@/api/projectProcess/projectProcess";
+import {taskDelegation, taskJump} from "@/api/projectProcess/projectProcess";
export default {
name: "Record",
@@ -274,6 +274,24 @@
this.getFlowFormData(this.taskId);
},
methods: {
+ // 璺宠繃浠诲姟
+ jumpTask() {
+ this.$confirm('纭畾瑕佽烦杩囨浠诲姟鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let jumpForm = {
+ taskId: this.taskId,
+ projectId: this.goBackParams.projectId,
+ processInsId: this.procInsId
+ }
+ taskJump(jumpForm).then(res => {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.goBack()
+ })
+ })
+ },
removeDept(dept) {
let index = this.delegationDeptSelect.indexOf(dept);
if (index !== -1) {
--
Gitblit v1.8.0