geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into dev-sugx20250509

Browse Source 
# Conflicts:
#	.env.development
#	.env.production
#	src/utils/env.ts
#	src/views/secondDev/LoginForm.vue
This commit is contained in:
suguangxu
2025-06-06 15:20:51 +08:00
parent 090457b5e7 792b78df1d
commit 1f7e0e6763
38 changed files with 683 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/workflow/task/components/flow/ProcessInformation.vue
View File

@ -168,7 +168,7 @@ if (props.canClick) {
.flow-record-box {
width: 100%;
height: 80vh;
height: 65vh;
position: relative;
margin-top: 50px;
}

20
src/views/workflow/task/components/processTasks/Drafts.vue
View File

@ -43,16 +43,32 @@
const { t } = useI18n();
const configColumns: BasicColumn[] = [
{
title: t('流程名称'),
title: t('流程定义名称'),
dataIndex: 'schemaName',
align: 'left',
},
{
title: t('发起者'),
title: t('任务名称'),
dataIndex: 'taskName',
align: 'left',
},
{
title: t('流程待办名称'),
dataIndex: 'processName',
align: 'left',
},
{
title: t('流程发起者'),
dataIndex: 'originator',
sorter: true,
align: 'left',
},
{
title: t('创建人'),
dataIndex: 'createUserName',
sorter: true,
align: 'left',
},
{
title: t('发起时间'),
dataIndex: 'createDate',

20
src/views/workflow/task/components/processTasks/DraftsV2.vue
View File

@ -27,16 +27,32 @@ const { t } = useI18n();
const router = useRouter();
const configColumns = [
{
title: t('流程名称'),
title: t('流程定义名称'),
dataIndex: 'schemaName',
align: 'left'
},
{
title: t('发起者'),
title: t('任务名称'),
dataIndex: 'taskName',
align: 'left',
},
{
title: t('流程待办名称'),
dataIndex: 'processName',
align: 'left',
},
{
title: t('流程发起者'),
dataIndex: 'originator',
sorter: true,
align: 'left'
},
{
title: t('创建人'),
dataIndex: 'createUserName',
sorter: true,
align: 'left',
},
{
title: t('发起时间'),
dataIndex: 'createDate',