From 81fb177169cbd55c1c8aa5c9165ab26b060a00b1 Mon Sep 17 00:00:00 2001 From: liubei Date: Wed, 12 Feb 2025 16:47:00 +0800 Subject: [PATCH 01/80] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/axios/service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 618f14a9..7c31e0b2 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -201,6 +201,10 @@ const refreshToken = async () => { const handleAuthorized = () => { const { t } = useI18n() if (!isRelogin.show) { + // 如果已经到登录页面则不进行弹窗提示 + if (window.location.href.includes('login')) { + return + } isRelogin.show = true ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), { showCancelButton: false, From 0439ad29ba37337dc9a4d952dfacde665dc7c797 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Mon, 17 Mar 2025 08:55:19 +0800 Subject: [PATCH 02/80] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=BD=AE=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/model/form/ExtraSettings.vue | 86 ++++++++++++++++++++-- 1 file changed, 81 insertions(+), 5 deletions(-) diff --git a/src/views/bpm/model/form/ExtraSettings.vue b/src/views/bpm/model/form/ExtraSettings.vue index 3c8e689b..fa6947d4 100644 --- a/src/views/bpm/model/form/ExtraSettings.vue +++ b/src/views/bpm/model/form/ExtraSettings.vue @@ -148,7 +148,7 @@
流程启动后通知
@@ -168,9 +168,9 @@
-
流程启动后通知
+
流程结束后通知
+ + +
+
+ +
任务执行时通知
+
+ +
+ + + +
+
+ +
任务结束后通知
+
+ +
+ @@ -248,7 +288,7 @@ const numberExample = computed(() => { /** 是否开启流程前置通知 */ const processBeforeTriggerEnable = ref(false) -const handlePreProcessNotifyEnableChange = (val: boolean | string | number) => { +const handleProcessBeforeTriggerEnableChange = (val: boolean | string | number) => { if (val) { modelData.value.processBeforeTriggerSetting = { url: '', @@ -263,7 +303,7 @@ const handlePreProcessNotifyEnableChange = (val: boolean | string | number) => { /** 是否开启流程后置通知 */ const processAfterTriggerEnable = ref(false) -const handlePostProcessNotifyEnableChange = (val: boolean | string | number) => { +const handleProcessAfterTriggerEnableChange = (val: boolean | string | number) => { if (val) { modelData.value.processAfterTriggerSetting = { url: '', @@ -276,6 +316,36 @@ const handlePostProcessNotifyEnableChange = (val: boolean | string | number) => } } +/** 是否开启任务前置通知 */ +const taskBeforeTriggerEnable = ref(false) +const handleTaskBeforeTriggerEnableChange = (val: boolean | string | number) => { + if (val) { + modelData.value.taskBeforeTriggerSetting = { + url: '', + header: [], + body: [], + response: [] + } + } else { + modelData.value.taskBeforeTriggerSetting = null + } +} + +/** 是否开启任务后置通知 */ +const taskAfterTriggerEnable = ref(false) +const handleTaskAfterTriggerEnableChange = (val: boolean | string | number) => { + if (val) { + modelData.value.taskAfterTriggerSetting = { + url: '', + header: [], + body: [], + response: [] + } + } else { + modelData.value.taskAfterTriggerSetting = null + } +} + /** 表单选项 */ const formField = ref>([]) const formFieldOptions4Title = computed(() => { @@ -341,6 +411,12 @@ const initData = () => { if (modelData.value.processAfterTriggerSetting) { processAfterTriggerEnable.value = true } + if (modelData.value.taskBeforeTriggerSetting) { + taskBeforeTriggerEnable.value = true + } + if (modelData.value.taskAfterTriggerSetting) { + taskAfterTriggerEnable.value = true + } } defineExpose({ initData }) From 1b3cbfc8819fe03510d41bcc6b84f9f78707cc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E5=A8=81?= Date: Mon, 17 Mar 2025 15:33:11 +0800 Subject: [PATCH 03/80] =?UTF-8?q?=E3=80=90Simple=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E3=80=91=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B->?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF->=E8=B0=81=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=8F=91=E8=B5=B7=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=A4=9A=E4=B8=AA=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 指定部门可以在部门新增成员后无需重新修改相关流程 # Conflicts: # src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue # src/views/bpm/model/form/index.vue --- src/components/DeptSelectForm/index.vue | 120 ++++++++++++++++++ .../src/SimpleProcessDesigner.vue | 6 + .../src/nodes-config/StartUserNodeConfig.vue | 65 +++++++--- .../bpm/model/CategoryDraggableModel.vue | 15 ++- src/views/bpm/model/form/BasicInfo.vue | 74 ++++++++++- src/views/bpm/model/form/ProcessDesign.vue | 1 + src/views/bpm/model/form/index.vue | 18 ++- src/views/bpm/simple/SimpleModelDesign.vue | 2 + 8 files changed, 279 insertions(+), 22 deletions(-) create mode 100644 src/components/DeptSelectForm/index.vue diff --git a/src/components/DeptSelectForm/index.vue b/src/components/DeptSelectForm/index.vue new file mode 100644 index 00000000..9c6868fa --- /dev/null +++ b/src/components/DeptSelectForm/index.vue @@ -0,0 +1,120 @@ + + + \ No newline at end of file diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue index e9a9b3f5..7823c2f8 100644 --- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue +++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue @@ -59,6 +59,11 @@ const props = defineProps({ startUserIds: { type: Array, required: false + }, + // 可发起流程的部门编号 + startDeptIds: { + type: Array, + required: false } }) @@ -82,6 +87,7 @@ provide('deptList', deptOptions) provide('userGroupList', userGroupOptions) provide('deptTree', deptTreeOptions) provide('startUserIds', props.startUserIds) +provide('startDeptIds', props.startDeptIds) provide('tasks', []) provide('processInstance', {}) const message = useMessage() // 国际化 diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue index 663b4db0..f1100d24 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue @@ -25,21 +25,38 @@ - 全部成员可以发起流程 - - {{ getUserNicknames(startUserIds) }} 可发起流程 - - - - {{ getUserNicknames(startUserIds.slice(0, 2)) }} 等 - {{ startUserIds.length }} 人可发起流程 - - + 全部成员可以发起流程 +
+ + {{ getUserNicknames(startUserIds) }} 可发起流程 + + + + {{ getUserNicknames(startUserIds.slice(0,2)) }} 等 {{ startUserIds.length }} 人可发起流程 + + +
+
+ + {{ getDeptNames(startDeptIds) }} 可发起流程 + + + + {{ getDeptNames(startDeptIds.slice(0,2)) }} 等 {{ startDeptIds.length }} 个部门的人可发起流程 + + +
+
@@ -107,6 +124,7 @@ import { SimpleFlowNode, NodeType, FieldPermissionType, START_USER_BUTTON_SETTING } from '../consts' import { useWatchNode, useDrawer, useNodeName, useFormFieldsPermission } from '../node' import * as UserApi from '@/api/system/user' +import * as DeptApi from '@/api/system/dept' defineOptions({ name: 'StartUserNodeConfig' }) @@ -118,8 +136,12 @@ const props = defineProps({ }) // 可发起流程的用户编号 const startUserIds = inject>('startUserIds') +// 可发起流程的部门编号 +const startDeptIds = inject>('startDeptIds') // 用户列表 const userOptions = inject>('userList') +// 部门列表 +const deptOptions = inject>('deptList') // 抽屉配置 const { settingVisible, closeDrawer, openDrawer } = useDrawer() // 当前节点 @@ -145,6 +167,19 @@ const getUserNicknames = (userIds: number[]): string => { }) return nicknames.join(',') } +const getDeptNames = (deptIds: number[]): string => { + if (!deptIds || deptIds.length === 0) { + return '' + } + const deptNames: string[] = [] + deptIds.forEach((deptId) => { + const found = deptOptions?.value.find((item) => item.id === deptId) + if (found && found.name) { + deptNames.push(found.name) + } + }) + return deptNames.join(',') +} // 保存配置 const saveConfig = async () => { activeTabName.value = 'user' diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue index 4e4c1827..89a3217e 100644 --- a/src/views/bpm/model/CategoryDraggableModel.vue +++ b/src/views/bpm/model/CategoryDraggableModel.vue @@ -97,10 +97,23 @@ From a5c533bff034ffd4e7b87ea9b33dcdb0ef6e4828 Mon Sep 17 00:00:00 2001 From: lizhixian <18210040298@163.com> Date: Fri, 21 Mar 2025 10:24:16 +0800 Subject: [PATCH 06/80] =?UTF-8?q?feat=EF=BC=9A=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8F=91=E8=B5=B7=E6=97=B6=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/oa/leave/create.vue | 175 +++++++++++++++++------------- 1 file changed, 97 insertions(+), 78 deletions(-) diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue index 4160fb03..b0d66f4a 100644 --- a/src/views/bpm/oa/leave/create.vue +++ b/src/views/bpm/oa/leave/create.vue @@ -1,70 +1,75 @@ From 913c995562ecbb826d0db2f0041b888d5795fa11 Mon Sep 17 00:00:00 2001 From: lizhixian <18210040298@163.com> Date: Fri, 21 Mar 2025 11:48:13 +0800 Subject: [PATCH 07/80] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=A1=88?= =?UTF-8?q?=E4=BE=8B=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=9A=E5=8A=A1=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B5=B7=E6=97=B6=E9=80=89=E6=8B=A9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/oa/leave/create.vue | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue index b0d66f4a..2bd2aa74 100644 --- a/src/views/bpm/oa/leave/create.vue +++ b/src/views/bpm/oa/leave/create.vue @@ -138,12 +138,12 @@ const submitForm = async () => { // 新增 ====== begin ======== /** 获取审批详情 */ -const getApprovalDetail = async (row: any) => { +const getApprovalDetail = async () => { try { const data = await ProcessInstanceApi.getApprovalDetail({ - processDefinitionId: row.id, + processDefinitionId: processDefinitionId.value, activityId: NodeId.START_USER_NODE_ID, - processVariablesStr: row.processVariablesStr // 解决 GET 无法传递对象的问题，后端 String 再转 JSON + processVariablesStr: JSON.stringify({ day: daysDifference() }) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON }) if (!data) { @@ -178,6 +178,13 @@ const getApprovalDetail = async (row: any) => { const selectUserConfirm = (id: string, userList: any[]) => { startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id) } + +// 计算天数差 +const daysDifference = () => { + const oneDay = 24 * 60 * 60 * 1000 // 一天的毫秒数 + const diffTime = Math.abs(Number(formData.value.endTime) - Number(formData.value.startTime)) + return Math.floor(diffTime / oneDay) +} // 新增 ====== end ======== /** 初始化 */ @@ -194,15 +201,12 @@ onMounted(async () => { processDefinitionId.value = processDefinitionDetail.id startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks // 新增 ====== begin ======== - // 查询流程预测节点 - getApprovalDetail({ - id: processDefinitionId.value, - processVariablesStr: JSON.stringify(formData.value) - }) + // 加载最新的审批详情,主要用于节点预测 + getApprovalDetail() // 新增 ====== end ======== }) // 新增 ====== begin ======== -/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次 */ +/** 预测流程节点会因为输入的参数值而产生新的预测结果值，所以需重新预测一次, formData.value可改成实际业务中的特定字段 */ watch( formData.value, (newValue, oldValue) => { @@ -213,11 +217,8 @@ watch( // 记录之前的节点审批人 tempStartUserSelectAssignees.value = startUserSelectAssignees.value startUserSelectAssignees.value = {} - // 加载最新的审批详情 - getApprovalDetail({ - id: processDefinitionId.value, - processVariablesStr: JSON.stringify(newValue) // 解决 GET 无法传递对象的问题，后端 String 再转 JSON - }) + // 加载最新的审批详情,主要用于节点预测 + getApprovalDetail() } }, { From a4fe1db1a5faf46223cd6e8aadf7d532d3d75d97 Mon Sep 17 00:00:00 2001 From: Bin Date: Sun, 23 Mar 2025 02:21:36 +0800 Subject: [PATCH 08/80] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Dialog=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=9C=A8=20v-model=20=E5=8F=8C=E5=90=91=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=9A=84=E5=B1=9E=E6=80=A7=E6=97=A0=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E9=97=AE=E9=A2=98=E5=87=BA=E5=9C=A8?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=9A=84=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=82=B9=E5=87=BB=E5=85=B3=E9=97=AD=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E9=80=9A=E7=9F=A5=E7=88=B6=E7=BB=84=E4=BB=B6=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/src/Dialog.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index a1eb550c..9bf5b7ab 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -68,6 +68,7 @@ const dialogStyle = computed(() => { draggable class="com-dialog" :show-close="false" + @close="$emit('update:modelValue', false)" >