From 53424765f9b36c6a61ce666c2e0e4f53ed0f3e5e Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 14 Mar 2025 10:25:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?update=20=E7=BB=9F=E4=B8=80=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E7=BC=96=E7=A0=81=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/processDefinition/index.vue | 9 +++++---- src/views/workflow/processInstance/index.vue | 1 + src/views/workflow/task/allTaskWaiting.vue | 1 + src/views/workflow/task/myDocument.vue | 1 + src/views/workflow/task/taskCopyList.vue | 3 ++- src/views/workflow/task/taskFinish.vue | 1 + src/views/workflow/task/taskWaiting.vue | 1 + 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index 5ea14116..789041dc 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -27,8 +27,8 @@ - - + + 搜索 @@ -67,6 +67,7 @@ + @@ -356,7 +357,7 @@ const getUnPublishList = async () => { const handleDelete = async (row?: FlowDefinitionVo) => { const id = row?.id || ids.value; const defList = processDefinitionList.value.filter((x) => id.indexOf(x.id) != -1).map((x) => x.flowCode); - await proxy?.$modal.confirm('是否确认删除流程定义KEY为【' + defList + '】的数据项？'); + await proxy?.$modal.confirm('是否确认删除流程定义编码为【' + defList + '】的数据项？'); loading.value = true; await deleteDefinition(id).finally(() => (loading.value = false)); await handleQuery(); @@ -366,7 +367,7 @@ const handleDelete = async (row?: FlowDefinitionVo) => { /** 发布流程定义 */ const handlePublish = async (row?: FlowDefinitionVo) => { await proxy?.$modal.confirm( - '是否确认发布流程定义KEY为【' + row.flowCode + '】版本为【' + row.version + '】的数据项？，发布后会将已发布流程定义改为失效！' + '是否确认发布流程定义编码为【' + row.flowCode + '】版本为【' + row.version + '】的数据项？，发布后会将已发布流程定义改为失效！' ); loading.value = true; await publish(row.id).finally(() => (loading.value = false)); diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 4edb033a..128c9015 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -76,6 +76,7 @@ + diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index 51611f3e..cf1ca528 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -40,6 +40,7 @@ + diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index cd5de1b7..a0090d64 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -48,6 +48,7 @@ + diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index c883e283..673960fd 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -32,7 +32,8 @@ - + + diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index a5bec2b3..786202a7 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -38,6 +38,7 @@ + diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index 14983e2b..31feb902 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -38,6 +38,7 @@ + -- Gitee From 6b2838141af2f5354803c05991a3b386559b0aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 14 Mar 2025 16:14:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?=E5=88=99=E5=81=9A=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/ruoyi.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/utils/ruoyi.ts b/src/utils/ruoyi.ts index 07a4a6b6..79f55473 100644 --- a/src/utils/ruoyi.ts +++ b/src/utils/ruoyi.ts @@ -171,6 +171,9 @@ export const handleTree = (data: any[], id?: string, parentId?: string, child for (const d of data) { const id = d[config.id]; childrenListMap[id] = d; + if (!d[config.childrenList]) { + d[config.childrenList] = []; + } } for (const d of data) { -- Gitee From 597c8370d3b7ac3ba9d6c20db4a78d4bc03b82a1 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Fri, 14 Mar 2025 23:41:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?update=20=E8=A1=A5=E5=85=85=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Process/processMeddle.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/Process/processMeddle.vue b/src/components/Process/processMeddle.vue index 635e2fb7..d024b691 100644 --- a/src/components/Process/processMeddle.vue +++ b/src/components/Process/processMeddle.vue @@ -85,9 +85,13 @@ const task = ref({ nodeName: undefined, flowCode: undefined, flowStatus: undefined, + formCustom: undefined, + formPath: undefined, nodeType: undefined, nodeRatio: undefined, - version: undefined + version: undefined, + applyNode: undefined, + buttonList: [] }); const open = (taskId: string) => { @@ -171,7 +175,7 @@ const deleteMultiInstanceUser = async (row) => { }; //获取办理人 const handleTaskUser = async () => { - let data = await currentTaskAllUser(task.value.id); + const data = await currentTaskAllUser(task.value.id); deleteUserList.value = data.data; if (deleteUserList.value && deleteUserList.value.length > 0) { deleteUserList.value.forEach((e) => { @@ -183,7 +187,7 @@ const handleTaskUser = async () => { //终止任务 const handleTerminationTask = async () => { - let params = { + const params = { taskId: task.value.id, comment: '' }; -- Gitee From d8a395bfd1c535db12dccad3e9696c40f822c7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 17 Mar 2025 09:36:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 05750723..eb43d653 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -7,21 +7,20 @@ export const useDict = (...args: string[]): { [key: string]: DictDataOption[] } const res = ref<{ [key: string]: DictDataOption[]; }>({}); - return (() => { - args.forEach(async (dictType) => { - res.value[dictType] = []; - const dicts = useDictStore().getDict(dictType); - if (dicts) { - res.value[dictType] = dicts; - } else { - await getDicts(dictType).then((resp) => { - res.value[dictType] = resp.data.map( - (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }) - ); - useDictStore().setDict(dictType, res.value[dictType]); - }); - } - }); - return res.value; - })(); + + args.forEach(async (dictType) => { + res.value[dictType] = []; + const dicts = useDictStore().getDict(dictType); + if (dicts) { + res.value[dictType] = dicts; + } else { + await getDicts(dictType).then((resp) => { + res.value[dictType] = resp.data.map( + (p): DictDataOption => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }) + ); + useDictStore().setDict(dictType, res.value[dictType]); + }); + } + }); + return res.value; }; -- Gitee From 48e9f2c5c020c7061badb7f9aa615a3c7e3996e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 18 Mar 2025 17:45:01 +0800 Subject: [PATCH 5/8] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=B8=8E=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E4=BB=8E=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=86=85?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login.vue | 3 ++- src/views/register.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/login.vue b/src/views/login.vue index 7b14f859..eebde18e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -2,7 +2,7 @@