From 88e83d773a58039f585d4eac271e587440a1848c Mon Sep 17 00:00:00 2001 From: zhihao <18915542763@163.com> Date: Wed, 17 Jun 2026 10:14:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?czh-20260617-=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=88=91=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8A=9E=E7=90=86=E7=BC=BA=E5=A4=B1=E7=BB=8F=E5=8A=9E=E4=BA=BA?= =?UTF-8?q?=EF=BC=9B=E5=88=A0=E9=99=A4=E9=A6=96=E9=A1=B5=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessPortal/components/MyWork.vue | 36 ++++++++++++++++++- .../components/WelcomeBanner.vue | 2 +- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/views/dashboard/ProcessPortal/components/MyWork.vue b/src/views/dashboard/ProcessPortal/components/MyWork.vue index 50a17ae..1d122d3 100644 --- a/src/views/dashboard/ProcessPortal/components/MyWork.vue +++ b/src/views/dashboard/ProcessPortal/components/MyWork.vue @@ -147,12 +147,46 @@ vars: result.records, }; let tempFormUrl = result.formUrl; - if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !/^http[s]?:\/\/.*/.test(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) { + //节点配置表单URL，VUE组件类型对应的拓展参数 + if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !isURL(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) { tempFormUrl = result.formUrl.split('?')[0]; + let qv: any = getQueryVariable(result.formUrl); + if (qv.edit == 1) { + formData['disabled'] = false; + } + formData.extendUrlParams = qv; + } + //如果没有taskId参数，程序自动追加，用于设计器表单节点权限 + if (tempFormUrl != null && tempFormUrl.indexOf('{{DOMAIN_URL}}/desform/') != -1 && tempFormUrl.indexOf('taskId') == -1) { + tempFormUrl = tempFormUrl.trim(); + if (tempFormUrl.endsWith('?')) { + tempFormUrl = tempFormUrl + 'taskId=' + result.taskDefKey; + } else { + tempFormUrl = tempFormUrl + '&taskId=' + result.taskDefKey; + } } return { formData, formUrl: tempFormUrl }; } + function isURL(s) { + return /^http[s]?:\/\/.*/.test(s); + } + + function getQueryVariable(url) { + if (!url) return; + let t, + n, + r, + i = url.split('?')[1], + s = {}; + (t = i.split('&')), (r = null), (n = null); + for (let o in t) { + let u = t[o].indexOf('='); + u !== -1 && ((r = t[o].substr(0, u)), (n = t[o].substr(u + 1)), (s[r] = n)); + } + return s; + } + async function handleClaim(record) { await taskClaim({ taskId: record.id }); await reloadTodo(); diff --git a/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue b/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue index a989b58..c619da3 100644 --- a/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue +++ b/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue @@ -4,7 +4,7 @@
-

{{ greeting }}，{{ userinfo.realname }}👋

+

{{ greeting }}，{{ userinfo.realname }}

From 34f5ec35cc8453aa7e133f0fbaf23312ed3a1b11 Mon Sep 17 00:00:00 2001 From: new_new_new <8454518+new-twice@user.noreply.gitee.com> Date: Wed, 17 Jun 2026 02:21:08 +0000 Subject: [PATCH 2/3] =?UTF-8?q?!45=20feat(xispeak):=20=E8=A1=A5=E5=85=85BP?= =?UTF-8?q?M=E8=A1=A8=E5=8D=95=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(xispeak): 补充BPM表单审批意见任务节点映射 * style(xispeak): 优化查询表单布局并替换牵头部门选人组件 --- src/views/bg/xispeak/BgXiSpeakList.vue | 14 +- .../xispeak/components/BgXiSpeakBPMForm.vue | 131 +++++++++--------- 2 files changed, 77 insertions(+), 68 deletions(-) diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index 4f90d64..be25e79 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -4,14 +4,14 @@
- - + + - + - + @@ -92,7 +92,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JInput from '/@/components/Form/src/jeecg/components/JInput.vue'; - import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; + import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue'; import BgXiSpeakModal from './components/BgXiSpeakModal.vue'; import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue'; @@ -793,6 +793,10 @@ :deep(.ant-input-number) { width: 100%; } + + :deep(.ant-form-item-label > label) { + overflow: visible; + } } .erpNativeList { diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue index 92be68e..e6ee152 100644 --- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue +++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue @@ -71,11 +71,11 @@ - - - - - + + + + + @@ -86,16 +86,16 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -124,14 +118,14 @@ - - - - - - - - + + + + + + + + @@ -150,34 +144,34 @@ /> - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -236,7 +230,6 @@ />