From 799cff58a3ef4c9a495fa3ca0e41514ea1245cce Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Mon, 28 Apr 2025 08:44:35 +0800 Subject: [PATCH 01/20] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?2.=E8=8D=89=E7=A8=BF=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=BF=87=E6=BB=A4=E5=92=8C=E4=BB=BB=E5=8A=A1=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpmn/components/ApproveUserRules.vue | 200 ++++++++++++++++++ .../components/member/MemberUserTable.vue | 76 +++++++ 2 files changed, 276 insertions(+) create mode 100644 src/views/workflow/design/bpmn/components/ApproveUserRules.vue create mode 100644 src/views/workflow/design/bpmn/components/member/MemberUserTable.vue diff --git a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue new file mode 100644 index 0000000..9988344 --- /dev/null +++ b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue new file mode 100644 index 0000000..13535c4 --- /dev/null +++ b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue @@ -0,0 +1,76 @@ + + + + + From 13a33b2506a55fe1425d94fe931a80d64d226727 Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Mon, 28 Apr 2025 08:46:43 +0800 Subject: [PATCH 02/20] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?2.=E8=8D=89=E7=A8=BF=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=BF=87=E6=BB=A4=E5=92=8C=E4=BB=BB=E5=8A=A1=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/template/index.vue | 53 ++++--------------- .../task/components/processTasks/DraftsV2.vue | 15 +++++- 2 files changed, 23 insertions(+), 45 deletions(-) diff --git a/src/views/form/template/index.vue b/src/views/form/template/index.vue index cde5c0a..b44a789 100644 --- a/src/views/form/template/index.vue +++ b/src/views/form/template/index.vue @@ -8,7 +8,6 @@ :clickRowToExpand="true" :treeData="treeData" :fieldNames="fieldNames" - @row-dbClick="dbClickRow" :row-selection="rowSelection" > diff --git a/src/views/workflow/design/bpmn/panel/User.vue b/src/views/workflow/design/bpmn/panel/User.vue index 77895fd..70a4878 100644 --- a/src/views/workflow/design/bpmn/panel/User.vue +++ b/src/views/workflow/design/bpmn/panel/User.vue @@ -18,7 +18,7 @@ - + Date: Mon, 28 Apr 2025 08:50:53 +0800 Subject: [PATCH 04/20] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?2.=E8=8D=89=E7=A8=BF=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=BF=87=E6=BB=A4=E5=92=8C=E4=BB=BB=E5=8A=A1=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/bpmn/config/propertyConfig.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index b661ff2..64fa380 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -144,9 +144,14 @@ const UserProperties: UserTaskConfig = { autoAgreeRule: [], //自动同意规则 isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人 provisionalApprover: false, //临时审批人 + provisionalDistributor: false, //临时传阅人 isChooseMulti: true, //是否多选 isChooseAll: false, //是否全选 isReadOnly: false, //是否只读 + minAppRovers: '', //最少审批人 + maxAppRovers: '', //最多审批人 + maxReaders: '', //最少传阅人 + minReaders: '', //最多传阅人 noHandler: NoHandler.ADMIN, //无对应处理人 countersignConfig: { multipleInstancesType: MultipleInstancesType.NONE, //多实例类型 From 585fdffa51634e4b37cf694accd43aebb26ed6bf Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Tue, 29 Apr 2025 09:53:18 +0800 Subject: [PATCH 05/20] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BC=A0=E9=98=85?= =?UTF-8?q?=E4=BA=BA=E9=85=8D=E7=BD=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpmn/components/ApproveUserRules.vue | 24 +++++++++---------- .../components/member/MemberUserTable.vue | 24 +++++++++---------- .../design/bpmn/config/propertyConfig.ts | 8 +++---- src/views/workflow/design/bpmn/panel/User.vue | 8 +++---- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue index 9988344..9085289 100644 --- a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue @@ -49,18 +49,18 @@ @@ -78,8 +78,8 @@ 'update:isChooseMulti', 'update:isChooseAll', 'update:isReadOnly', - 'update:minAppRovers', - 'update:maxAppRovers', + 'update:minApprover', + 'update:maxApprover', ]); const props = defineProps({ autoAgreeRule: Array, @@ -101,11 +101,11 @@ type: Boolean || undefined, default: undefined, }, - minAppRovers: { + minApprover: { type: Number, default: 0, }, - maxAppRovers: { + maxApprover: { type: Number, default: 0, }, @@ -188,12 +188,12 @@ emits('update:isReadOnly', val); } // 最少审批人 - function changeMinAppRovers(val: number) { - emits('update:minAppRovers', val); + function changeMinApprover(val: number) { + emits('update:minApprover', val); } // 最多审批人 - function changeMaxAppRovers(val: number) { - emits('update:maxAppRovers', val); + function changeMaxApprover(val: number) { + emits('update:maxApprover', val); } diff --git a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue index 13535c4..4995443 100644 --- a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue +++ b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue @@ -11,18 +11,18 @@ @@ -33,8 +33,8 @@ const { t } = useI18n(); const emits = defineEmits([ 'update:provisionalDistributor', - 'update:maxReaders', - 'update:minReaders' + 'update:maxCirculate', + 'update:minCirculate' ]); const props = defineProps({ isChooseMulti: { @@ -49,11 +49,11 @@ type: Boolean || undefined, default: undefined, }, - maxReaders: { + maxCirculate: { type: Number, default: 0, }, - minReaders: { + minCirculate: { type: Number, default: 0, }, @@ -64,12 +64,12 @@ emits('update:provisionalDistributor', val); } //最多传阅人 - function changeMaxReaders(val: number) { - emits('update:maxReaders', val); + function changeMaxCirculate(val: number) { + emits('update:maxCirculate', val); } //最少传阅人 - function changeMinReaders(val: number) { - emits('update:minReaders', val); + function changeMinCirculate(val: number) { + emits('update:minCirculate', val); } diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index 64fa380..d0662a3 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -148,10 +148,10 @@ const UserProperties: UserTaskConfig = { isChooseMulti: true, //是否多选 isChooseAll: false, //是否全选 isReadOnly: false, //是否只读 - minAppRovers: '', //最少审批人 - maxAppRovers: '', //最多审批人 - maxReaders: '', //最少传阅人 - minReaders: '', //最多传阅人 + minApprover: '', //最少审批人 + maxApprover: '', //最多审批人 + maxCirculate: '', //最多传阅人 + minCirculate: '', //最少传阅人 noHandler: NoHandler.ADMIN, //无对应处理人 countersignConfig: { multipleInstancesType: MultipleInstancesType.NONE, //多实例类型 diff --git a/src/views/workflow/design/bpmn/panel/User.vue b/src/views/workflow/design/bpmn/panel/User.vue index 70a4878..5001944 100644 --- a/src/views/workflow/design/bpmn/panel/User.vue +++ b/src/views/workflow/design/bpmn/panel/User.vue @@ -26,8 +26,8 @@ v-model:isChooseMulti="formInfo.isChooseMulti" v-model:isChooseAll="formInfo.isChooseAll" v-model:isReadOnly="formInfo.isReadOnly" - v-model:minAppRovers="formInfo.minAppRovers" - v-model:maxAppRovers="formInfo.maxAppRovers" + v-model:minApprover="formInfo.minApprover" + v-model:maxApprover="formInfo.maxApprover" /> Date: Tue, 29 Apr 2025 15:01:00 +0800 Subject: [PATCH 06/20] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=96=E6=B5=81=E7=A8=8B=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=202.=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7,?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=96=E4=B8=8B=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/model/workflow/workflowConfig.ts | 4 + .../design/bpmn/components/ApproveRules.vue | 126 +++++++++++++++++- .../bpmn/components/ApproveUserRules.vue | 4 +- .../components/member/MemberUserTable.vue | 4 +- .../workflow/design/bpmn/config/property.ts | 4 + .../design/bpmn/config/propertyConfig.ts | 4 + .../design/bpmn/panel/process/basic/Index.vue | 8 ++ 7 files changed, 149 insertions(+), 5 deletions(-) diff --git a/src/model/workflow/workflowConfig.ts b/src/model/workflow/workflowConfig.ts index 0377566..af5b756 100644 --- a/src/model/workflow/workflowConfig.ts +++ b/src/model/workflow/workflowConfig.ts @@ -90,6 +90,10 @@ export interface ProcessConfig { parentId: string; //父节点（流程id） remark: string; //节点描述 code: string; //模板编码 + minApprover: string; //最少审批人 + maxApprover: string; //最多审批人 + maxCirculate: string; //最多传阅人 + minCirculate: string; //最少传阅人 category: undefined | string; //分类 nameRule?: string; //命名规则 nameRuleConfigs?: NameRule; // 命名规则列表 diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue index f9a7a0f..d0d05af 100644 --- a/src/views/workflow/design/bpmn/components/ApproveRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue @@ -5,7 +5,7 @@ style="width: 100%" :tree-data="autoAgreeRuleOptions" tree-checkable - allow-clear + ow-clear :placeholder="t('请选择自动同意规则')" @change="changeAutoAgreeRule" /> @@ -26,6 +26,59 @@ @change="changeDesignatedApprover" /> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue index 9085289..bb1f6fa 100644 --- a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue @@ -103,11 +103,11 @@ }, minApprover: { type: Number, - default: 0, + default: null, }, maxApprover: { type: Number, - default: 0, + default: null, }, }); diff --git a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue index 4995443..9063cbd 100644 --- a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue +++ b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue @@ -51,11 +51,11 @@ }, maxCirculate: { type: Number, - default: 0, + default: null, }, minCirculate: { type: Number, - default: 0, + default: null, }, }); diff --git a/src/views/workflow/design/bpmn/config/property.ts b/src/views/workflow/design/bpmn/config/property.ts index c5487c7..43f915c 100644 --- a/src/views/workflow/design/bpmn/config/property.ts +++ b/src/views/workflow/design/bpmn/config/property.ts @@ -75,6 +75,10 @@ export const initProperties = (id: InfoId, type: InfoType, name: string, parentI properties.autoAgreeRule = processInfo.autoAgreeRule; properties.noHandler = processInfo.noHandler; properties.isPrevChooseNext = processInfo.isPrevChooseNext; + properties.minApprover = processInfo.minApprover; + properties.maxApprover = processInfo.maxApprover; + properties.maxCirculate = processInfo.maxCirculate; + properties.minCirculate = processInfo.minCirculate; } if (id === 'Activity_draft') { // 将草稿节点的审批人设置为流程发起者 diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index d0662a3..f4ef585 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -46,6 +46,10 @@ export const processConfig: ProcessConfig = { nameRule: '', //命名规则 nameRuleConfigs: [], // 命名规则列表 autoAgreeRule: [], //自动同意规则 + minApprover: '', //最少审批人 + maxApprover: '', //最多审批人 + maxCirculate: '', //最多传阅人 + minCirculate: '', //最少传阅人 isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人 noHandler: NoHandler.ADMIN, //无对应处理人 appShow: false, //移动端是否显示 diff --git a/src/views/workflow/design/bpmn/panel/process/basic/Index.vue b/src/views/workflow/design/bpmn/panel/process/basic/Index.vue index e1a7fcd..f7b23c0 100644 --- a/src/views/workflow/design/bpmn/panel/process/basic/Index.vue +++ b/src/views/workflow/design/bpmn/panel/process/basic/Index.vue @@ -28,6 +28,14 @@ v-model:autoAgreeRule="processInfo.autoAgreeRule" v-model:noHandler="processInfo.noHandler" v-model:isPrevChooseNext="processInfo.isPrevChooseNext" + v-model:provisionalApprover="processInfo.provisionalApprover" + v-model:isChooseMulti="processInfo.isChooseMulti" + v-model:isChooseAll="processInfo.isChooseAll" + v-model:isReadOnly="processInfo.isReadOnly" + v-model:minApprover="processInfo.minApprover" + v-model:maxApprover="processInfo.maxApprover" + v-model:maxCirculate="processInfo.maxCirculate" + v-model:minCirculate="processInfo.minCirculate" /> From c794fe51cbacf1f60a567107c8077a4773f01f65 Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Tue, 29 Apr 2025 15:02:48 +0800 Subject: [PATCH 07/20] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=96=E6=B5=81=E7=A8=8B=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=202.=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7,?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=96=E4=B8=8B=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/design/bpmn/components/ApproveRules.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue index d0d05af..818f3a7 100644 --- a/src/views/workflow/design/bpmn/components/ApproveRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue @@ -5,7 +5,7 @@ style="width: 100%" :tree-data="autoAgreeRuleOptions" tree-checkable - ow-clear + allow-clear :placeholder="t('请选择自动同意规则')" @change="changeAutoAgreeRule" /> From 99e753a13da7231305be0dbd347984e47af4e0be Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Thu, 8 May 2025 10:24:19 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=8B=E4=BB=B6=E7=BC=BA=E9=99=B7=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/template/index.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/form/template/index.vue b/src/views/form/template/index.vue index b44a789..69f6546 100644 --- a/src/views/form/template/index.vue +++ b/src/views/form/template/index.vue @@ -578,17 +578,23 @@ } function handleView(record: Recordable) { - if (record.workflowData?.taskIds && record.workflowData.taskIds.length) { - const { processId, schemaId } = record.workflowData; + const { processId, taskIds, schemaId } = record.workflowData || {}; + if (taskIds && taskIds.length) { router.push({ path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', query: { - readonly: 1, - taskId: '', - rtId: currentRoute.value.query.rtId + taskId: taskIds[0], } }); - } else { + } else if (schemaId && !taskIds && processId) { + router.push({ + path: '/flow/' + schemaId + '/' + processId + '/approveFlow', + query: { + readonly: 1, + taskId: '', + } + }); + }else { const info = { id: record[pkField.value], releaseId: menuId.value, From 17ee1fe96281574175b6fcdbe6889b6db1f701a4 Mon Sep 17 00:00:00 2001 From: "825299534@qq.com" Date: Thu, 8 May 2025 11:39:01 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/task/components/processTasks/Drafts.vue | 5 +++++ src/views/workflow/task/components/processTasks/DraftsV2.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/views/workflow/task/components/processTasks/Drafts.vue b/src/views/workflow/task/components/processTasks/Drafts.vue index 9f03b59..e2e4e69 100644 --- a/src/views/workflow/task/components/processTasks/Drafts.vue +++ b/src/views/workflow/task/components/processTasks/Drafts.vue @@ -52,6 +52,11 @@ dataIndex: 'taskName', align: 'left', }, + { + title: t('流程待办名称'), + dataIndex: 'processName', + align: 'left', + }, { title: t('流程发起者'), dataIndex: 'originator', diff --git a/src/views/workflow/task/components/processTasks/DraftsV2.vue b/src/views/workflow/task/components/processTasks/DraftsV2.vue index a882f82..b1f2893 100644 --- a/src/views/workflow/task/components/processTasks/DraftsV2.vue +++ b/src/views/workflow/task/components/processTasks/DraftsV2.vue @@ -36,6 +36,11 @@ const configColumns = [ dataIndex: 'taskName', align: 'left', }, + { + title: t('流程待办名称'), + dataIndex: 'processName', + align: 'left', + }, { title: t('流程发起者'), dataIndex: 'originator', From a023895e261b69dd100b3b2016a1bf3cc6b30fd9 Mon Sep 17 00:00:00 2001 From: dyd <15993027711@163.com> Date: Mon, 12 May 2025 11:28:58 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auditOpt/auditRecord/index.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/auditOpt/auditRecord/index.ts b/src/api/auditOpt/auditRecord/index.ts index 86b9999..2d4cfeb 100644 --- a/src/api/auditOpt/auditRecord/index.ts +++ b/src/api/auditOpt/auditRecord/index.ts @@ -3,12 +3,12 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/auditOpt/auditRecord/page', - List = '/auditOpt/auditRecord/list', - Info = '/auditOpt/auditRecord/info', - XjrWorkflowApproveRecord = '/auditOpt/auditRecord', + Page = '/workflow/workflowApproveRecord/page', + List = '/workflow/workflowApproveRecord/list', + Info = '/workflow/workflowApproveRecord/info', + XjrWorkflowApproveRecord = '/workflow/workflowApproveRecord', GetApproveRecord = '/workflow/adminOperation/getAllApproveRecord', - DelApproveRecord = '/auditOpt/auditRecord', + DelApproveRecord = '/workflow/workflowApproveRecord', AddApproveRcord = '/workflow/adminOperation/addApproveRecord', UpdateApproveRcord = '/workflow/adminOperation/updateApproveRecord', } @@ -151,4 +151,4 @@ export async function updateApproveRecord(params:any, mode: ErrorMessageMode = ' errorMessageMode: mode, }, ); -} \ No newline at end of file +} From ea23305544e8142c236410b44279da5850f85f95 Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Wed, 14 May 2025 19:25:41 +0800 Subject: [PATCH 11/20] =?UTF-8?q?feat:=20=E9=80=89=E4=BA=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8F=AF=E9=80=89=E9=A1=B9=20=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=91=E6=90=9C=E7=B4=A2=E6=98=AF=E5=90=A6=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E4=B8=8B=E7=BA=A7=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/SelectUserV2.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Form/src/components/SelectUserV2.vue b/src/components/Form/src/components/SelectUserV2.vue index ae4a65a..13fe820 100644 --- a/src/components/Form/src/components/SelectUserV2.vue +++ b/src/components/Form/src/components/SelectUserV2.vue @@ -117,6 +117,10 @@ justCompany: { type: Boolean, default: false + }, + isOnlyCurrentDepartment: { // 仅当前部门,无下级部门 + type: Boolean, + default: true } }); let timeoutId = null; @@ -205,14 +209,14 @@ limit: 1, size: 10000, departmentId: '', - departmentIds: defaultDepts.value + departmentIds: defaultDepts.value, + isOnlyCurrentDepartment: props.isOnlyCurrentDepartment, }); const searchDepartMemberTotal = ref(0); const searchDepartMemberList = ref([]); const searchAllMemberParams = ref({ limit: 1, size: 25, - isSearchAll: true, keyword: '', departmentIds: defaultDepts.value }); From a7b81c46b877a226f149075b144b8aec62cbb938 Mon Sep 17 00:00:00 2001 From: gaoyunqi Date: Fri, 16 May 2025 17:56:07 +0800 Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E6=B3=A8=E5=85=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/SimpleFormItem.vue | 32 +------------------ .../src/components/SimpleFormItemSetup.vue | 2 -- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue index 9d1c495..b460a47 100644 --- a/src/components/SimpleForm/src/components/SimpleFormItem.vue +++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue @@ -219,8 +219,7 @@ const tabActiveKey = inject>('tabActiveKey', ref(0)); const activeKey = ref(0); const isCamelCase = inject('isCamelCase', false); - // 注入整个表单的配置，formProps是个计算属性，不能修改，formData则来自每个业务的表单页面。 - const formData = inject('formData', { noInject: true }); + watch( () => tabActiveKey?.value, (val) => { @@ -240,35 +239,6 @@ } ); - // watch( - // () => props.value, - // (val) => { - // if (!val) return; - // let { componentProps = {} } = props.schema; - // if (componentProps['events']) { - // for (const eventKey in componentProps['events']) { - // try { - // const event = new Function( - // 'schema', - // 'formModel', - // 'formActionType', - // `${componentProps['events'][eventKey]}`, - // ); - // event(props.schema, formModel, props.formApi); - // } catch (error) { - // notification.error({ - // message: 'Tip', - // description: '触发事件填写有误！', - // }); - // } - // } - // } - // }, - // { - // immediate: true, - // }, - // ); - const { notification } = useMessage(); const getSchema = computed(() => { return props.schema as FormSchema; diff --git a/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue b/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue index 0dfa458..496ced4 100644 --- a/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue +++ b/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue @@ -53,8 +53,6 @@ const tabActiveKey = inject>('tabActiveKey', ref(0)); const activeKey = ref(0); const isCamelCase = inject('isCamelCase', false); - // 注入整个表单的配置，formProps是个计算属性，不能修改，formData则来自每个业务的表单页面。 - const formData = inject('formData', { noInject: true }); watch( () => tabActiveKey?.value, (val) => { From 9b65db300770b9af92c6d5a05eb3ac290392feae Mon Sep 17 00:00:00 2001 From: yangjiewei <1658539101@qq.com> Date: Wed, 21 May 2025 16:37:04 +0800 Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=AD=90?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7=E7=BB=91=E5=AE=9A=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/design/bpmn/components/ApproveUserRules.vue | 4 ++-- .../design/bpmn/components/member/MemberUserTable.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue index bb1f6fa..6cd0876 100644 --- a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue @@ -49,7 +49,7 @@ Date: Mon, 26 May 2025 11:18:37 +0800 Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4onchange?= =?UTF-8?q?=E9=87=8C=E6=97=A0=E7=94=A8=E7=9A=84=E5=87=BD=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SimpleForm/src/components/SimpleFormItem.vue | 2 +- .../SimpleForm/src/components/SimpleFormItemSetup.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue index b460a47..4aba3d0 100644 --- a/src/components/SimpleForm/src/components/SimpleFormItem.vue +++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue @@ -290,7 +290,7 @@ let field = camelCaseString(item); if (field) cloneFormModel[field] = cloneFormModel[item]; } - event(props.schema, isCamelCase ? cloneFormModel : formModel, props.formApi, { formData, value, selectedOptions }); + event(props.schema, isCamelCase ? cloneFormModel : formModel, props.formApi, { value, selectedOptions }); if (isCamelCase) { for (let item in formModel) { diff --git a/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue b/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue index 496ced4..058e511 100644 --- a/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue +++ b/src/components/SimpleForm/src/components/SimpleFormItemSetup.vue @@ -122,7 +122,7 @@ let field = camelCaseString(item); if (field) cloneFormModel[field] = cloneFormModel[item]; } - event(props.schema, isCamelCase ? cloneFormModel : formModel, props.formApi, { formData }); + event(props.schema, isCamelCase ? cloneFormModel : formModel, props.formApi, {}); if (isCamelCase) { for (let item in formModel) { From bd1da3a4650a7ebdb25c373043490e64016a5684 Mon Sep 17 00:00:00 2001 From: Chen_Jie_Wen Date: Tue, 27 May 2025 10:49:54 +0800 Subject: [PATCH 15/20] =?UTF-8?q?feat:=20=E5=B0=86=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=96=B9=E6=B3=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/BasicTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 9c86a52..6851f6f 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -383,7 +383,7 @@ ); createTableContext({ ...tableAction, wrapRef, getBindValues }); - expose(tableAction); + expose({...tableAction, beforeSearchInfoChange}); emit("register", tableAction, formActions); From 37ee6f390185252c77965b448ee08d9275d4e4f0 Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Tue, 27 May 2025 11:49:17 +0800 Subject: [PATCH 16/20] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BF=A1=E6=81=AF=E9=AB=98=E5=BA=A6=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE=E6=BC=8F=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/task/components/flow/ProcessInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/workflow/task/components/flow/ProcessInformation.vue b/src/views/workflow/task/components/flow/ProcessInformation.vue index dfe0897..93552cd 100644 --- a/src/views/workflow/task/components/flow/ProcessInformation.vue +++ b/src/views/workflow/task/components/flow/ProcessInformation.vue @@ -168,7 +168,7 @@ if (props.canClick) { .flow-record-box { width: 100%; - height: 80vh; + height: 65vh; position: relative; margin-top: 50px; } From cd6317313bf27f928fcee1b6b734b392db92f6c1 Mon Sep 17 00:00:00 2001 From: yangjiewei <1658539101@qq.com> Date: Thu, 29 May 2025 17:15:23 +0800 Subject: [PATCH 17/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93?= =?UTF-8?q?=E5=8C=85=E5=90=8E=E5=A4=B4=E5=83=8F=E5=9B=BE=E7=89=87=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E8=B7=AF=E5=BE=84=E5=87=BA=E9=94=99=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/components/Cropper/src/CropperAvatar.vue | 4 +++- .../default/header/components/user-dropdown/DropDown.vue | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Cropper/src/CropperAvatar.vue b/src/components/Cropper/src/CropperAvatar.vue index b6b8017..8f101cd 100644 --- a/src/components/Cropper/src/CropperAvatar.vue +++ b/src/components/Cropper/src/CropperAvatar.vue @@ -14,7 +14,7 @@ :height="200" :preview="false" :src="sourceValue" - fallback="src/assets/images/header.jpg" + :fallback="headerImg" />
- +
@@ -117,7 +117,8 @@ getUserInfo, handleMenuClick, register, - getUseLockPage + getUseLockPage, + headerImg }; }, methods: { From e2d478c8513a64559fa33eabf442d02e076e0ce8 Mon Sep 17 00:00:00 2001 From: yaoyn Date: Fri, 30 May 2025 11:29:54 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=98=E9=87=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 ++++-- index.html | 6 ++++-- src/components/Application/src/AppLogo.vue | 8 +++++--- src/hooks/web/useTitle.ts | 2 +- src/views/dashboard/analysis/index.vue | 4 +++- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 2eb64c5..4fc23da 100644 --- a/.env +++ b/.env @@ -4,11 +4,13 @@ VITE_PORT = 3100 # spa-title VITE_GLOB_APP_TITLE = 全代码平台 -# spa shortname +# spa shortname(英文缩写) VITE_GLOB_APP_SHORT_NAME = 全代码平台 -# 应用名称 +# 应用名称（仅展示在登录页和左上角logo旁，其他情况用VITE_GLOB_APP_TITLE） VITE_SYSTEM_NAME = 全代码平台 +# 应用名称简写，用于空间不足的界面显示（左上角logo旁，7个字以内，超出变成...） +# VITE_SYSTEM_SHORT_NAME = 全代码平台 # 响应式布局的表单宽度分界 VITE_RESP_LG_WIDTH = 1280 diff --git a/index.html b/index.html index 46206ca..376de98 100644 --- a/index.html +++ b/index.html @@ -33,9 +33,11 @@ const { data } = await responseStream.json(); if (data.shortName) { document.title = data.shortName; - document.getElementById('app-loading-title').innerText = data.shortName; + if(document.getElementById('app-loading-title')){ + document.getElementById('app-loading-title').innerText = data.shortName; + } } - if (data.refreshLogoUrl) { + if (data.refreshLogoUrl&&document.getElementById('app-loading-logo')) { document.getElementById('app-loading-logo').setAttribute('src', data.refreshLogoUrl); } } catch { diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 9abb8db..b4d7d7d 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -4,10 +4,10 @@ -->