From 1f1cd489be1d12ed18219be86d43dc019fd08933 Mon Sep 17 00:00:00 2001 From: imlam Date: Tue, 3 Jun 2025 17:26:56 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=88=B6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=ADUserSelect=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E6=8B=A9=E5=90=8E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/processInstance/index.vue | 3 +++ src/views/workflow/task/allTaskWaiting.vue | 3 +++ src/views/workflow/task/taskFinish.vue | 3 +++ src/views/workflow/task/taskWaiting.vue | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 9265c524..30371479 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -405,6 +405,9 @@ const openUserSelect = () => { //确认选择申请人 const userSelectCallBack = (data: UserVO[]) => { userSelectCount.value = 0; + selectUserIds.value = []; + queryParams.value.createByIds = []; + if (data && data.length > 0) { userSelectCount.value = data.length; selectUserIds.value = data.map((item) => item.userId); diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index 026628a4..9dc0c893 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -242,6 +242,9 @@ const openUserSelect = () => { //确认选择申请人 const userSelectCallBack = (data: UserVO[]) => { userSelectCount.value = 0; + selectUserIds.value = []; + queryParams.value.createByIds = []; + if (data && data.length > 0) { userSelectCount.value = data.length; selectUserIds.value = data.map((item) => item.userId); diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index 786202a7..130cce99 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -169,6 +169,9 @@ const openUserSelect = () => { //确认选择申请人 const userSelectCallBack = (data: UserVO[]) => { userSelectCount.value = 0; + selectUserIds.value = []; + queryParams.value.createByIds = []; + if (data && data.length > 0) { userSelectCount.value = data.length; selectUserIds.value = data.map((item) => item.userId); diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index 31feb902..c4b92676 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -171,6 +171,9 @@ const openUserSelect = () => { //确认选择申请人 const userSelectCallBack = (data: UserVO[]) => { userSelectCount.value = 0; + selectUserIds.value = []; + queryParams.value.createByIds = []; + if (data && data.length > 0) { userSelectCount.value = data.length; selectUserIds.value = data.map((item) => item.userId); -- Gitee From ba257e235714f219b33bf5e50f51a6787ad47dde 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: Wed, 4 Jun 2025 09:57:25 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E7=BB=84=E4=BB=B6=E5=8F=98=E9=87=8F=E5=90=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Process/submitVerify.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index 20e73718..2d99d548 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -273,7 +273,7 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']); /** 办理流程 */ const handleCompleteTask = async () => { form.value.taskId = taskId.value; - form.value.taskVariables = props.taskVariables; + form.value.variables = props.taskVariables; let verify = false; if (buttonObj.value.pop && nestNodeList.value && nestNodeList.value.length > 0) { nestNodeList.value.forEach((e) => { -- Gitee From 1034399fe4ef84438248b125467feaf520ed079c 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: Thu, 5 Jun 2025 18:28:19 +0800 Subject: [PATCH 03/11] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=A5=97=E9=A4=90=E8=8F=9C=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=20=E7=A7=9F=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/tenantPackage/index.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue index 0a442f02..84a9f2b1 100644 --- a/src/views/system/tenantPackage/index.vue +++ b/src/views/system/tenantPackage/index.vue @@ -108,7 +108,7 @@ import { updateTenantPackage, changePackageStatus } from '@/api/system/tenantPackage'; -import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api/system/menu'; +import { tenantPackageMenuTreeselect } from '@/api/system/menu'; import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types'; import { MenuTreeOption } from '@/api/system/menu/types'; import to from 'await-to-js'; @@ -158,12 +158,6 @@ const data = reactive>({ const { queryParams, form, rules } = toRefs(data); -/** 查询菜单树结构 */ -const getMenuTreeselect = async () => { - const { data } = await menuTreeselect(); - menuOptions.value = data; -}; - // 所有菜单节点数据 const getMenuAllCheckedKeys = (): any => { // 目前被选中的菜单节点 @@ -265,9 +259,9 @@ const handleCheckedTreeConnect = (value: CheckboxValueType, type: string) => { }; /** 新增按钮操作 */ -const handleAdd = () => { +const handleAdd = async () => { reset(); - getMenuTreeselect(); + await getPackageMenuTreeselect(0); dialog.visible = true; dialog.title = '添加租户套餐'; }; -- Gitee From 48b5d595dfc1abe9edfc0ca41085900aa1cdee46 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, 16 Jun 2025 13:49:24 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=8E?= =?UTF-8?q?=E6=97=A0=E7=BC=93=E5=AD=98=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=88=B0=E6=9C=89=E7=BC=93=E5=AD=98=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/AppMain.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 85e53242..b6c7b61c 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,14 +1,11 @@