diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index d29de30..526c558 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -220,9 +220,9 @@ export const getInstanceVariable = (taskId: string) => {
* 获取可驳回得任务节点
* @returns
*/
-export const getTaskNodeList = (processInstanceId: string) => {
+export const getBackTaskNode = (processInstanceId: string) => {
return request({
- url: `/workflow/task/getTaskNodeList/${processInstanceId}`,
+ url: `/workflow/task/getBackTaskNode/${processInstanceId}`,
method: 'get'
});
};
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 8bdf95f..5ac198f 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -24,16 +24,16 @@
@@ -48,10 +48,10 @@
-
+
-
-
+
+
@@ -80,12 +80,12 @@
import { ref } from 'vue';
import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task';
+import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getBackTaskNode, delegateTask } from '@/api/workflow/task';
import UserSelect from '@/components/UserSelect';
import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { UserVO } from '@/api/system/user/types';
-import { TaskVO } from '@/api/workflow/task/types';
+import { FlowTaskVO } from '@/api/workflow/task/types';
const userSelectCopyRef = ref>();
const transferTaskRef = ref>();
const delegateTaskRef = ref>();
@@ -116,33 +116,22 @@ const backButtonDisabled = ref(true);
// 可驳回得任务节点
const taskNodeList = ref([]);
//任务
-const task = ref({
+const task = ref({
id: undefined,
- name: undefined,
- description: undefined,
- priority: undefined,
- owner: undefined,
- assignee: undefined,
- assigneeName: undefined,
- processInstanceId: undefined,
- executionId: undefined,
- taskDefinitionId: undefined,
- processDefinitionId: undefined,
- endTime: undefined,
- taskDefinitionKey: undefined,
- dueDate: undefined,
- category: undefined,
- parentTaskId: undefined,
+ createTime: undefined,
+ updateTime: undefined,
tenantId: undefined,
- claimTime: undefined,
- businessStatus: undefined,
- businessStatusName: undefined,
- processDefinitionName: undefined,
- processDefinitionKey: undefined,
- participantVo: undefined,
- multiInstance: undefined,
- businessKey: undefined,
- wfNodeConfigVo: undefined
+ definitionId: undefined,
+ instanceId: undefined,
+ flowName: undefined,
+ businessId: undefined,
+ nodeCode: undefined,
+ nodeName: undefined,
+ flowCode: undefined,
+ flowStatus: undefined,
+ nodeType: undefined,
+ wfNodeConfigVo: undefined,
+ wfDefinitionConfigVo: undefined
});
//加签 减签标题
const title = ref('');
@@ -160,7 +149,7 @@ const form = ref>({
});
const backForm = ref>({
taskId: undefined,
- targetActivityId: undefined,
+ nodeCode: undefined,
message: undefined,
variables: {},
messageType: ['1']
@@ -226,11 +215,11 @@ const handleBackProcessOpen = async () => {
backVisible.value = true;
backLoading.value = true;
backButtonDisabled.value = true;
- let data = await getTaskNodeList(task.value.processInstanceId);
+ let data = await getBackTaskNode(task.value.instanceId);
taskNodeList.value = data.data;
backLoading.value = false;
backButtonDisabled.value = false;
- backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
+ backForm.value.nodeCode = taskNodeList.value[0].nodeCode;
};
/** 驳回流程 */
const handleBackProcess = async () => {
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 617025a..4edde0c 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -350,7 +350,7 @@ const handleView = (row) => {
const routerJumpVo = reactive({
wfDefinitionConfigVo: row.wfDefinitionConfigVo,
wfNodeConfigVo: row.wfNodeConfigVo,
- businessKey: row.businessKey,
+ businessKey: row.businessId,
taskId: row.id,
type: 'view'
});