From 2ea1807f34479f683f4fc3691dfccf4146b94706 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sun, 31 Mar 2024 15:34:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflow/definitionConfig/index.ts | 38 +++ .../types.ts | 36 ++- src/api/workflow/formDefinition/index.ts | 38 --- src/api/workflow/formManage/index.ts | 76 ++++++ src/api/workflow/formManage/types.ts | 75 ++++++ src/api/workflow/nodeConfig/index.ts | 63 +++++ src/api/workflow/nodeConfig/types.ts | 43 +++ src/api/workflow/task/types.ts | 6 +- src/api/workflow/workflowCommon/index.ts | 49 ++++ src/api/workflow/workflowCommon/types.ts | 10 + src/components/BpmnDesign/panel/TaskPanel.vue | 25 +- src/views/workflow/formManage/index.vue | 249 ++++++++++++++++++ .../workflow/processDefinition/index.vue | 39 ++- src/views/workflow/processInstance/index.vue | 22 +- src/views/workflow/task/allTaskWaiting.vue | 26 +- src/views/workflow/task/myDocument.vue | 22 +- src/views/workflow/task/taskCopyList.vue | 24 +- src/views/workflow/task/taskFinish.vue | 26 +- src/views/workflow/task/taskWaiting.vue | 36 +-- 19 files changed, 744 insertions(+), 159 deletions(-) create mode 100644 src/api/workflow/definitionConfig/index.ts rename src/api/workflow/{formDefinition => definitionConfig}/types.ts (53%) delete mode 100644 src/api/workflow/formDefinition/index.ts create mode 100644 src/api/workflow/formManage/index.ts create mode 100644 src/api/workflow/formManage/types.ts create mode 100644 src/api/workflow/nodeConfig/index.ts create mode 100644 src/api/workflow/nodeConfig/types.ts create mode 100644 src/api/workflow/workflowCommon/index.ts create mode 100644 src/api/workflow/workflowCommon/types.ts create mode 100644 src/views/workflow/formManage/index.vue diff --git a/src/api/workflow/definitionConfig/index.ts b/src/api/workflow/definitionConfig/index.ts new file mode 100644 index 0000000..44c3e85 --- /dev/null +++ b/src/api/workflow/definitionConfig/index.ts @@ -0,0 +1,38 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DefinitionConfigVO, DefinitionConfigForm } from '@/api/workflow/definitionConfig/types'; + + +/** + * 查询表单配置详细 + * @param id + */ +export const getByDefId = (definitionId: string | number): AxiosPromise => { + return request({ + url: '/workflow/definitionConfig/getByDefId/' + definitionId, + method: 'get' + }); +}; + +/** + * 新增表单配置 + * @param data + */ +export const saveOrUpdate = (data: DefinitionConfigForm) => { + return request({ + url: '/workflow/definitionConfig/saveOrUpdate', + method: 'post', + data: data + }); +}; + +/** + * 删除表单配置 + * @param id + */ +export const deldefinitionConfig = (id: string | number | Array) => { + return request({ + url: '/workflow/definitionConfig/' + id, + method: 'delete' + }); +}; diff --git a/src/api/workflow/formDefinition/types.ts b/src/api/workflow/definitionConfig/types.ts similarity index 53% rename from src/api/workflow/formDefinition/types.ts rename to src/api/workflow/definitionConfig/types.ts index 5a8f37b..836e7f4 100644 --- a/src/api/workflow/formDefinition/types.ts +++ b/src/api/workflow/definitionConfig/types.ts @@ -1,13 +1,15 @@ -export interface FormDefinitionVO { +import { FormManageVO } from '@/api/workflow/formManage/types'; + +export interface DefinitionConfigVO { /** * 主键 */ id: string | number; /** - * 路由地址 + * 表单ID */ - path: string; + formId?: string | number; /** * 流程定义ID @@ -24,18 +26,23 @@ export interface FormDefinitionVO { */ remark: string; + /** + * 表单管理 + */ + wfFormManageVo: FormManageVO; + } -export interface FormDefinitionForm extends BaseEntity { +export interface DefinitionConfigForm extends BaseEntity { /** * 主键 */ id?: string | number; /** - * 路由地址 + * 表单ID */ - path?: string; + formId?: string | number; /** * 流程定义ID @@ -52,14 +59,20 @@ export interface FormDefinitionForm extends BaseEntity { */ remark?: string; + /** + * 表单管理 + */ + wfFormManageVo: FormManageVO; + + } -export interface FormDefinitionQuery extends PageQuery { +export interface DefinitionConfigQuery extends PageQuery { /** - * 路由地址 + * 表单ID */ - path?: string; + formId?: string | number; /** * 流程定义ID @@ -72,9 +85,10 @@ export interface FormDefinitionQuery extends PageQuery { processKey?: string; /** - * 日期范围参数 + * 表单管理 */ - params?: any; + wfFormManageVo: FormManageVO; + } diff --git a/src/api/workflow/formDefinition/index.ts b/src/api/workflow/formDefinition/index.ts deleted file mode 100644 index 7eed53d..0000000 --- a/src/api/workflow/formDefinition/index.ts +++ /dev/null @@ -1,38 +0,0 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { FormDefinitionVO, FormDefinitionForm, FormDefinitionQuery } from '@/api/workflow/formDefinition/types'; - - -/** - * 查询表单配置详细 - * @param id - */ -export const getByDefId = (definitionId: string | number): AxiosPromise => { - return request({ - url: '/workflow/formDefinition/getByDefId/' + definitionId, - method: 'get' - }); -}; - -/** - * 新增表单配置 - * @param data - */ -export const saveOrUpdate = (data: FormDefinitionForm) => { - return request({ - url: '/workflow/formDefinition/saveOrUpdate', - method: 'post', - data: data - }); -}; - -/** - * 删除表单配置 - * @param id - */ -export const delFormDefinition = (id: string | number | Array) => { - return request({ - url: '/workflow/formDefinition/' + id, - method: 'delete' - }); -}; diff --git a/src/api/workflow/formManage/index.ts b/src/api/workflow/formManage/index.ts new file mode 100644 index 0000000..c2930cf --- /dev/null +++ b/src/api/workflow/formManage/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { FormManageVO, FormManageForm, FormManageQuery } from '@/api/workflow/formManage/types'; + +/** + * 查询表单管理列表 + * @param query + * @returns {*} + */ + +export const listFormManage = (query?: FormManageQuery): AxiosPromise => { + return request({ + url: '/workflow/formManage/list', + method: 'get', + params: query + }); +}; + +/** + * 查询表单管理列表 + * @param query + * @returns {*} + */ + +export const selectListFormManage = (): AxiosPromise => { + return request({ + url: '/workflow/formManage/list/selectList', + method: 'get', + }); +}; + +/** + * 查询表单管理详细 + * @param id + */ +export const getFormManage = (id: string | number): AxiosPromise => { + return request({ + url: '/workflow/formManage/' + id, + method: 'get' + }); +}; + +/** + * 新增表单管理 + * @param data + */ +export const addFormManage = (data: FormManageForm) => { + return request({ + url: '/workflow/formManage', + method: 'post', + data: data + }); +}; + +/** + * 修改表单管理 + * @param data + */ +export const updateFormManage = (data: FormManageForm) => { + return request({ + url: '/workflow/formManage', + method: 'put', + data: data + }); +}; + +/** + * 删除表单管理 + * @param id + */ +export const delFormManage = (id: string | number | Array) => { + return request({ + url: '/workflow/formManage/' + id, + method: 'delete' + }); +}; diff --git a/src/api/workflow/formManage/types.ts b/src/api/workflow/formManage/types.ts new file mode 100644 index 0000000..38db96f --- /dev/null +++ b/src/api/workflow/formManage/types.ts @@ -0,0 +1,75 @@ +export interface FormManageVO { + /** + * 主键 + */ + id: string | number; + + /** + * 表单名称 + */ + formName: string; + + /** + * 表单类型 + */ + formType: string; + /** + * 表单类型名称 + */ + formTypeName: string; + + /** + * 路由地址/表单ID + */ + router: string; + + /** + * 备注 + */ + remork: string; + +} + +export interface FormManageForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 表单名称 + */ + formName?: string; + + /** + * 表单类型 + */ + formType?: string; + + /** + * 路由地址/表单ID + */ + router?: string; + + /** + * 备注 + */ + remork?: string; + +} + +export interface FormManageQuery extends PageQuery { + + /** + * 表单名称 + */ + formName?: string; + + /** + * 表单类型 + */ + formType?: string; +} + + + diff --git a/src/api/workflow/nodeConfig/index.ts b/src/api/workflow/nodeConfig/index.ts new file mode 100644 index 0000000..3270c17 --- /dev/null +++ b/src/api/workflow/nodeConfig/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { NodeConfigVO, NodeConfigForm, NodeConfigQuery } from '@/api/workflow/nodeConfig/types'; + +/** + * 查询节点配置列表 + * @param query + * @returns {*} + */ + +export const listNodeConfig = (query?: NodeConfigQuery): AxiosPromise => { + return request({ + url: '/workflow/nodeConfig/list', + method: 'get', + params: query + }); +}; + +/** + * 查询节点配置详细 + * @param id + */ +export const getNodeConfig = (id: string | number): AxiosPromise => { + return request({ + url: '/workflow/nodeConfig/' + id, + method: 'get' + }); +}; + +/** + * 新增节点配置 + * @param data + */ +export const addNodeConfig = (data: NodeConfigForm) => { + return request({ + url: '/workflow/nodeConfig', + method: 'post', + data: data + }); +}; + +/** + * 修改节点配置 + * @param data + */ +export const updateNodeConfig = (data: NodeConfigForm) => { + return request({ + url: '/workflow/nodeConfig', + method: 'put', + data: data + }); +}; + +/** + * 删除节点配置 + * @param id + */ +export const delNodeConfig = (id: string | number | Array) => { + return request({ + url: '/workflow/nodeConfig/' + id, + method: 'delete' + }); +}; diff --git a/src/api/workflow/nodeConfig/types.ts b/src/api/workflow/nodeConfig/types.ts new file mode 100644 index 0000000..4e3a60b --- /dev/null +++ b/src/api/workflow/nodeConfig/types.ts @@ -0,0 +1,43 @@ +import { FormManageVO } from '@/api/workflow/formManage/types'; + +export interface NodeConfigVO { + /** + * 主键 + */ + id: string | number; + + /** + * 表单id + */ + formId: string | number; + + /** + * 表单类型 + */ + formType: string; + + /** + * 节点名称 + */ + nodeName: string; + + /** + * 节点id + */ + nodeId: string | number; + + /** + * 流程定义id + */ + definitionId: string | number; + + /** + * 表单管理 + */ + wfFormManageVo: FormManageVO; + +} + + + + diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts index 412b0aa..2e39d06 100644 --- a/src/api/workflow/task/types.ts +++ b/src/api/workflow/task/types.ts @@ -1,3 +1,5 @@ +import { NodeConfigVO } from '@/api/workflow/nodeConfig/types'; +import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types'; export interface TaskQuery extends PageQuery { name?: string; processDefinitionKey?: string; @@ -37,8 +39,8 @@ export interface TaskVO extends BaseEntity { participantVo: ParticipantVo; multiInstance: boolean; businessKey: string; - formKey: string; - wfFormDefinitionVo: any; + wfNodeConfigVo: NodeConfigVO; + wfDefinitionConfigVo: DefinitionConfigVO; } export interface VariableVo { diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts new file mode 100644 index 0000000..b2846b2 --- /dev/null +++ b/src/api/workflow/workflowCommon/index.ts @@ -0,0 +1,49 @@ +import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; + +export default { + routerJump(routerJumpVo: RouterJumpVo,proxy){ + if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId + } + }); + } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId + } + }); + }else if (routerJumpVo.wfDefinitionConfigVo && routerJumpVo.wfDefinitionConfigVo.wfFormManageVo && routerJumpVo.wfDefinitionConfigVo.wfFormManageVo.formType === 'static') { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfDefinitionConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId + } + }); + }else if (routerJumpVo.wfDefinitionConfigVo && routerJumpVo.wfDefinitionConfigVo.wfFormManageVo && routerJumpVo.wfDefinitionConfigVo.wfFormManageVo.formType === 'dynamic') { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfDefinitionConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId + } + }); + } else { + proxy?.$modal.msgError('请到流程定义菜单配置路由！'); + } + } +} \ No newline at end of file diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts new file mode 100644 index 0000000..698c849 --- /dev/null +++ b/src/api/workflow/workflowCommon/types.ts @@ -0,0 +1,10 @@ +import { NodeConfigVO } from '@/api/workflow/nodeConfig/types'; +import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types'; + +export interface RouterJumpVo { + wfDefinitionConfigVo: DefinitionConfigVO; + wfNodeConfigVo: NodeConfigVO; + businessKey: string; + taskId: string; + type: string; +} \ No newline at end of file diff --git a/src/components/BpmnDesign/panel/TaskPanel.vue b/src/components/BpmnDesign/panel/TaskPanel.vue index 5a23702..fbd4669 100644 --- a/src/components/BpmnDesign/panel/TaskPanel.vue +++ b/src/components/BpmnDesign/panel/TaskPanel.vue @@ -21,8 +21,10 @@ - - + + + + @@ -239,9 +241,10 @@ import { TaskPanel } from 'bpmnDesign'; import { AllocationTypeEnum, MultiInstanceTypeEnum, SpecifyDescEnum } from '@/enums/bpmn/IndexEnums'; import { UserVO } from '@/api/system/user/types'; import { RoleVO } from '@/api/system/role/types'; - -const { proxy } = getCurrentInstance() as ComponentInternalInstance; - +import { selectListFormManage } from '@/api/workflow/formManage'; +import { FormManageVO } from '@/api/workflow/formManage/types'; +const formManageList = ref([]); +const formManageListLoading = ref(false); interface PropType { element: ModdleElement; } @@ -459,6 +462,18 @@ const SpecifyDesc = [ { id: 'fa253b34-4335-458c-b1bc-b039e2a2b7a6', label: '指定一个人', value: 'specifySingle' }, { id: '7365ff54-2e05-4312-9bfb-0b8edd779c5b', label: '指定多个人', value: 'specifyMultiple' } ]; + +const listFormManage = async () => { + formManageListLoading.value = true + const res = await selectListFormManage(); + formManageList.value = res.data; + formManageListLoading.value = false +} +onMounted(() => { + nextTick(() => { + listFormManage(); + }); +}); diff --git a/src/views/workflow/formManage/index.vue b/src/views/workflow/formManage/index.vue new file mode 100644 index 0000000..752f77d --- /dev/null +++ b/src/views/workflow/formManage/index.vue @@ -0,0 +1,249 @@ + + + diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index 6dfee4f..2712929 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -221,15 +221,17 @@ - + - + - - + + + + - + @@ -258,12 +260,15 @@ import { } from '@/api/workflow/processDefinition'; import ProcessPreview from './components/processPreview.vue'; import { listCategory } from '@/api/workflow/category'; -import { getByDefId,saveOrUpdate } from '@/api/workflow/formDefinition'; +import { getByDefId,saveOrUpdate } from '@/api/workflow/definitionConfig'; import { CategoryVO } from '@/api/workflow/category/types'; import { ProcessDefinitionQuery, ProcessDefinitionVO } from '@/api/workflow/processDefinition/types'; -import { FormDefinitionForm } from '@/api/workflow/formDefinition/types'; +import { definitionConfigForm } from '@/api/workflow/definitionConfig/types'; import { UploadRequestOptions } from 'element-plus'; +import { FormManageVO } from '@/api/workflow/formManage/types'; +import { selectListFormManage } from '@/api/workflow/formManage'; +const formManageList = ref([]); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const previewRef = ref>(); @@ -290,7 +295,7 @@ const categoryOptions = ref([]); const categoryName = ref(''); /** 部署文件分类选择 */ const selectCategory = ref(); -const formDefinitionForm = ref({}); +const definitionConfigForm = ref({}); const uploadDialog = reactive({ visible: false, @@ -473,21 +478,22 @@ const handerDeployProcessFile = (data: UploadRequestOptions): XMLHttpRequest => }; //打开表单配置 const handleFormOpen = async (row: ProcessDefinitionVO) => { + listFormManage() formDialog.visible = true - formDefinitionForm.value.processKey = row.key - formDefinitionForm.value.definitionId = row.id + definitionConfigForm.value.processKey = row.key + definitionConfigForm.value.definitionId = row.id const resp = await getByDefId(row.id) if(resp.data){ - formDefinitionForm.value = resp.data + definitionConfigForm.value = resp.data }else{ - formDefinitionForm.value.path = undefined - formDefinitionForm.value.remark = undefined + definitionConfigForm.value.formId = undefined + definitionConfigForm.value.remark = undefined } } //保存表单 const handlerSaveForm = async () => { await proxy?.$modal.confirm('是否确认保存？'); - saveOrUpdate(formDefinitionForm.value).then(resp=>{ + saveOrUpdate(definitionConfigForm.value).then(resp=>{ if(resp.code === 200){ proxy?.$modal.msgSuccess('操作成功'); formDialog.visible = false @@ -495,4 +501,9 @@ const handlerSaveForm = async () => { } }) } +//表单列表 +const listFormManage = async () => { + const res = await selectListFormManage(); + formManageList.value = res.data; +} diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 88746c7..0da78bc 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -161,6 +161,8 @@ import { getListByKey, migrationDefinition } from '@/api/workflow/processDefinit import { listCategory } from '@/api/workflow/category'; import { CategoryVO } from '@/api/workflow/category/types'; import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types'; +import workflowCommon from '@/api/workflow/workflowCommon'; +import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; //审批记录组件 const { proxy } = getCurrentInstance() as ComponentInternalInstance; const queryFormRef = ref(); @@ -347,18 +349,14 @@ const handleChange = async (id: string) => { }; /** 查看按钮操作 */ const handleView = (row) => { - if(row.wfFormDefinitionVo){ - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${row.wfFormDefinitionVo.path}`, - query: { - id: row.businessKey, - type: 'view' - } - }) - }else{ - proxy?.$modal.msgError('请到流程定义菜单配置路由！'); - } + const routerJumpVo = reactive({ + wfDefinitionConfigVo: row.wfDefinitionConfigVo, + wfNodeConfigVo: row.wfNodeConfigVo, + businessKey: row.businessKey, + taskId: row.id, + type: 'view' + }); + workflowCommon.routerJump(routerJumpVo,proxy) }; onMounted(() => { diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index eee6263..45ec729 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -54,13 +54,13 @@ @@ -129,6 +129,8 @@ import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstan import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue'; import UserSelect from '@/components/UserSelect'; import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types'; +import workflowCommon from '@/api/workflow/workflowCommon'; +import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; //审批记录组件 //加签组件 const multiInstanceUserRef = ref>(); @@ -260,18 +262,14 @@ const handleInstanceVariable = async (row: TaskVO) => { }; /** 查看按钮操作 */ const handleView = (row) => { - if(row.wfFormDefinitionVo){ - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${row.wfFormDefinitionVo.path}`, - query: { - id: row.businessKey, - type: 'view' - } - }) - }else{ - proxy?.$modal.msgError('请到流程定义菜单配置路由！'); - } + const routerJumpVo = reactive({ + wfDefinitionConfigVo: row.wfDefinitionConfigVo, + wfNodeConfigVo: row.wfNodeConfigVo, + businessKey: row.businessKey, + taskId: row.id, + type: 'view' + }); + workflowCommon.routerJump(routerJumpVo,proxy) }; onMounted(() => { getWaitingList(); diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index 9328934..8ccb3a5 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -117,6 +117,8 @@ import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@ import { listCategory } from '@/api/workflow/category'; import { CategoryVO } from '@/api/workflow/category/types'; import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types'; +import workflowCommon from '@/api/workflow/workflowCommon'; +import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const queryFormRef = ref(); const categoryTreeRef = ref(); @@ -250,17 +252,13 @@ const handleCancelProcessApply = async (processInstanceId: string) => { //办理 const handleOpen = async (row,type) => { - if(row.wfFormDefinitionVo){ - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${row.wfFormDefinitionVo.path}`, - query: { - id: row.businessKey, - type: type - } - }) - }else{ - proxy?.$modal.msgError('请到流程定义菜单配置路由！'); - } + const routerJumpVo = reactive({ + wfDefinitionConfigVo: row.wfDefinitionConfigVo, + wfNodeConfigVo: row.wfNodeConfigVo, + businessKey: row.businessKey, + taskId: row.id, + type: type + }); + workflowCommon.routerJump(routerJumpVo,proxy) }; diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 54e8f1e..7393999 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -43,7 +43,7 @@ @@ -73,6 +73,8 @@