Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c49e8bd3
authored
Oct 09, 2024
by
GoldenZqqq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 流程模型列表UI重构以及数组分类分组展示逻辑
parent
b293f157
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
165 additions
and
330 deletions
+165
-330
src/views/bpm/model/index.vue
+63
-54
src/views/bpm/model/index_new.vue
+102
-74
src/views/bpm/model/mock.js
+0
-202
No files found.
src/views/bpm/model/index.vue
View file @
c49e8bd3
<
template
>
<
template
>
<doc-alert
title=
"流程设计器(BPMN)"
url=
"https://doc.iocoder.cn/bpm/model-designer-dingding/"
/>
<doc-alert
title=
"流程设计器(钉钉、飞书)"
url=
"https://doc.iocoder.cn/bpm/model-designer-bpmn/"
/>
<doc-alert
title=
"选择审批人、发起人自选"
url=
"https://doc.iocoder.cn/bpm/assignee/"
/>
<doc-alert
title=
"会签、或签、依次审批"
url=
"https://doc.iocoder.cn/bpm/multi-instance/"
/>
<ContentWrap>
<ContentWrap>
<div
class=
"flex justify-between pl-20px items-center"
>
<h3>
表单管理
</h3>
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 -->
<el-form
<el-form
class=
"-mb-15px fle
x"
class=
"-mb-15p
x"
:model=
"queryParams"
:model=
"queryParams"
ref=
"queryFormRef"
ref=
"queryFormRef"
:inline=
"true"
:inline=
"true"
label-width=
"68px"
label-width=
"68px"
>
>
<el-form-item
align=
"right"
prop=
"key"
class=
"ml-auto
"
>
<el-form-item
label=
"流程标识"
prop=
"key
"
>
<el-input
<el-input
v-model=
"queryParams.key"
v-model=
"queryParams.key"
placeholder=
"搜索流程
"
placeholder=
"请输入流程标识
"
clearable
clearable
@
keyup
.
enter=
"handleQuery"
@
keyup
.
enter=
"handleQuery"
class=
"!w-240px"
class=
"!w-240px"
>
/>
<template
#
prefix
>
<Icon
icon=
"ep:search"
class=
"mx-10px"
/>
</
template
>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item
label=
"流程名称"
prop=
"name"
>
<el-button
type=
"primary"
@
click=
"openForm('create')"
v-hasPermi=
"['bpm:model:create']"
>
<el-input
<Icon
icon=
"ep:plus"
class=
"mr-5px"
/>
新建流程
v-model=
"queryParams.name"
</el-button>
placeholder=
"请输入流程名称"
clearable
@
keyup
.
enter=
"handleQuery"
class=
"!w-240px"
/>
</el-form-item>
<el-form-item
label=
"流程分类"
prop=
"category"
>
<el-select
v-model=
"queryParams.category"
placeholder=
"请选择流程分类"
clearable
class=
"!w-240px"
>
<el-option
v-for=
"category in categoryList"
:key=
"category.code"
:label=
"category.name"
:value=
"category.code"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"info"
plain
>
<el-button
@
click=
"handleQuery"
><Icon
icon=
"ep:search"
class=
"mr-5px"
/>
搜索
</el-button>
<Icon
icon=
"ep:setting"
/>
<el-button
@
click=
"resetQuery"
><Icon
icon=
"ep:refresh"
class=
"mr-5px"
/>
重置
</el-button>
<el-button
type=
"primary"
plain
@
click=
"openForm('create')"
v-hasPermi=
"['bpm:model:create']"
>
<Icon
icon=
"ep:plus"
class=
"mr-5px"
/>
新建
</el-button>
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</div>
</ContentWrap>
<el-divider
/>
<!-- 分类卡片组 -->
<!-- 列表 -->
<div
class=
"px-30px"
>
<ContentWrap>
<ContentWrap
v-for=
"(list, title) in categoryGroup"
:key=
"title"
>
<div
class=
"flex items-center mb-20px"
>
<h3
class=
"ml-20px mr-8px"
>
{{ title }}
</h3>
<div
class=
"text-[var(--el-text-color-placeholder)]"
>
({{ list?.length || 0 }})
</div>
</div>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
label=
"流程名"
align=
"center"
prop=
"name"
min-width=
"200"
>
<el-table-column
label=
"流程名称"
align=
"center"
prop=
"name"
min-width=
"200"
/>
<el-table-column
label=
"流程图标"
align=
"center"
prop=
"icon"
min-width=
"100"
>
<template
#
default=
"scope"
>
<template
#
default=
"scope"
>
<div
class=
"flex items-center"
>
<el-image
:src=
"scope.row.icon"
class=
"h-32px w-32px"
/>
<el-image
:src=
"scope.row.icon"
class=
"h-32px w-32px mr-10px rounded"
/>
{{
scope
.
row
.
name
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"可见范围"
align=
"center"
prop=
"startUserIds"
min-width=
"100"
>
<el-table-column
label=
"可见范围"
align=
"center"
prop=
"startUserIds"
min-width=
"100"
>
...
@@ -149,11 +167,7 @@
...
@@ -149,11 +167,7 @@
<el-dropdown
<el-dropdown
class=
"!align-middle ml-5px"
class=
"!align-middle ml-5px"
@
command=
"(command) => handleCommand(command, scope.row)"
@
command=
"(command) => handleCommand(command, scope.row)"
v-hasPermi=
"[
v-hasPermi=
"['bpm:process-definition:query', 'bpm:model:update', 'bpm:model:delete']"
'bpm:process-definition:query',
'bpm:model:update',
'bpm:model:delete'
]"
>
>
<el-button
type=
"primary"
link
>
更多
</el-button>
<el-button
type=
"primary"
link
>
更多
</el-button>
<template
#
dropdown
>
<template
#
dropdown
>
...
@@ -185,8 +199,13 @@
...
@@ -185,8 +199,13 @@
</template>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
</ContentWrap>
<!-- 分页 -->
</div>
<Pagination
:total=
"total"
v-model:page=
"queryParams.pageNo"
v-model:limit=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</ContentWrap>
</ContentWrap>
<!-- 表单弹窗:添加/修改流程 -->
<!-- 表单弹窗:添加/修改流程 -->
...
@@ -208,8 +227,6 @@ import { CategoryApi } from '@/api/bpm/category'
...
@@ -208,8 +227,6 @@ import { CategoryApi } from '@/api/bpm/category'
import
{
BpmModelType
}
from
'@/utils/constants'
import
{
BpmModelType
}
from
'@/utils/constants'
import
{
checkPermi
}
from
'@/utils/permission'
import
{
checkPermi
}
from
'@/utils/permission'
import
{
useUserStoreWithOut
}
from
'@/store/modules/user'
import
{
useUserStoreWithOut
}
from
'@/store/modules/user'
import
{
groupBy
}
from
'lodash-es'
import
{
mockData
}
from
'./mock'
defineOptions
({
name
:
'BpmModel'
})
defineOptions
({
name
:
'BpmModel'
})
...
@@ -217,7 +234,10 @@ const message = useMessage() // 消息弹窗
...
@@ -217,7 +234,10 @@ const message = useMessage() // 消息弹窗
const
{
t
}
=
useI18n
()
// 国际化
const
{
t
}
=
useI18n
()
// 国际化
const
{
push
}
=
useRouter
()
// 路由
const
{
push
}
=
useRouter
()
// 路由
const
userStore
=
useUserStoreWithOut
()
// 用户信息缓存
const
userStore
=
useUserStoreWithOut
()
// 用户信息缓存
const
loading
=
ref
(
true
)
// 列表的加载中
const
loading
=
ref
(
true
)
// 列表的加载中
const
total
=
ref
(
0
)
// 列表的总页数
const
list
=
ref
([])
// 列表的数据
const
queryParams
=
reactive
({
const
queryParams
=
reactive
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
10
,
pageSize
:
10
,
...
@@ -227,16 +247,14 @@ const queryParams = reactive({
...
@@ -227,16 +247,14 @@ const queryParams = reactive({
})
})
const
queryFormRef
=
ref
()
// 搜索的表单
const
queryFormRef
=
ref
()
// 搜索的表单
const
categoryList
=
ref
([])
// 流程分类列表
const
categoryList
=
ref
([])
// 流程分类列表
const
categoryGroup
=
ref
<
any
>
({})
// 按照category分组的数据
/** 查询列表 */
/** 查询列表 */
const
getList
=
async
()
=>
{
const
getList
=
async
()
=>
{
loading
.
value
=
true
loading
.
value
=
true
try
{
try
{
// TODO 芋艿:这里需要一个不分页查全部的流程模型接口
const
data
=
await
ModelApi
.
getModelPage
(
queryParams
)
const
data
=
await
ModelApi
.
getModelPage
(
queryParams
)
data
.
list
=
mockData
list
.
value
=
data
.
list
categoryGroup
.
value
=
groupBy
(
data
.
list
,
'categoryName'
)
total
.
value
=
data
.
total
}
finally
{
}
finally
{
loading
.
value
=
false
loading
.
value
=
false
}
}
...
@@ -384,12 +402,3 @@ onMounted(async () => {
...
@@ -384,12 +402,3 @@ onMounted(async () => {
categoryList
.
value
=
await
CategoryApi
.
getCategorySimpleList
()
categoryList
.
value
=
await
CategoryApi
.
getCategorySimpleList
()
})
})
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
:deep
(
.el-form--inline
.el-form-item
)
{
margin-right
:
10px
;
}
:deep
(
.el-divider--horizontal
)
{
margin-top
:
10px
;
}
</
style
>
src/views/bpm/model/index_
old
.vue
→
src/views/bpm/model/index_
new
.vue
View file @
c49e8bd3
This diff is collapsed.
Click to expand it.
src/views/bpm/model/mock.js
deleted
100644 → 0
View file @
b293f157
export
const
mockData
=
[
{
key
:
'out_apply'
,
name
:
'外出申请'
,
description
:
null
,
category
:
'1'
,
categoryName
:
'测试1'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/OA/goingOut/create'
,
formCustomViewPath
:
'/OA/goingOut/detail'
,
id
:
'ff8f8bab-4d4e-11ef-8201-0242ac130002'
,
formName
:
null
,
createTime
:
1722218716216
,
processDefinition
:
{
id
:
'out_apply:4:7f56d464-4eec-11ef-8c3a-0242ac130002'
,
version
:
4
,
deploymentTime
:
1722396312641
,
suspensionState
:
1
}
},
{
key
:
'contract_change_history'
,
name
:
'合同变更申请'
,
description
:
null
,
category
:
'2'
,
categoryName
:
'测试2'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/project/changeRecord/detail'
,
formCustomViewPath
:
'/project/changeRecord/detail'
,
id
:
'0c689067-3a92-11ef-b7f0-0242ac130002'
,
formName
:
null
,
createTime
:
1720158441959
,
processDefinition
:
{
id
:
'contract_change_history:1:f69fff4f-3a9a-11ef-b7f0-0242ac130002'
,
version
:
1
,
deploymentTime
:
1720162270788
,
suspensionState
:
1
}
},
{
key
:
'expenses_claim'
,
name
:
'费用报销申请'
,
description
:
null
,
category
:
'1'
,
categoryName
:
'测试1'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/finance/reimbursement/detail'
,
formCustomViewPath
:
'/finance/reimbursement/detail'
,
id
:
'0310ad0c-351e-11ef-a653-0242ac130002'
,
formName
:
null
,
createTime
:
1719558848849
,
processDefinition
:
{
id
:
'expenses_claim:5:a043a1d8-4eec-11ef-8c3a-0242ac130002'
,
version
:
5
,
deploymentTime
:
1722396367911
,
suspensionState
:
1
}
},
{
key
:
'out_business_apply'
,
name
:
'申请单'
,
description
:
null
,
category
:
'2'
,
categoryName
:
'测试2'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/finance/businessTripApply/detail'
,
formCustomViewPath
:
'/finance/businessTripApply/detail'
,
id
:
'279e27a4-3393-11ef-8401-0242ac130002'
,
formName
:
null
,
createTime
:
1719389258966
,
processDefinition
:
{
id
:
'out_business_apply:9:a7b2d4e2-430f-11ef-876f-0242ac130002'
,
version
:
9
,
deploymentTime
:
1721091998780
,
suspensionState
:
1
}
},
{
key
:
'pms_project_delay_application'
,
name
:
'项目延时申请'
,
description
:
null
,
category
:
'2'
,
categoryName
:
'测试2'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/project/workHourDelay/create'
,
formCustomViewPath
:
'/project/workHourDelay/detail'
,
id
:
'46d87275-27c7-11ef-b258-0242ac130002'
,
formName
:
null
,
createTime
:
1718092231234
,
processDefinition
:
{
id
:
'b7ed308a-430f-11ef-876f-0242ac130002'
,
version
:
5
,
deploymentTime
:
1721092026059
,
suspensionState
:
1
}
},
{
key
:
'pms_project_result_approval'
,
name
:
'项目成果审核'
,
description
:
null
,
category
:
'2'
,
categoryName
:
'测试2'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/project/projectTaskResult/detail'
,
formCustomViewPath
:
'/project/projectTaskResult/detail'
,
id
:
'4a15d4f8-23cc-11ef-8dd0-0242ac130002'
,
formName
:
null
,
createTime
:
1717654579502
,
processDefinition
:
{
id
:
'dd3cc360-4eec-11ef-8c3a-0242ac130002'
,
version
:
6
,
deploymentTime
:
1722396470232
,
suspensionState
:
1
}
},
{
key
:
'pms_contract'
,
name
:
'合同管理'
,
description
:
null
,
category
:
'2'
,
categoryName
:
'测试2'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/sales/contract/create'
,
formCustomViewPath
:
'/sales/contract/detail'
,
id
:
'8317cb71-0d1a-11ef-8445-70b5e844a623'
,
formName
:
null
,
createTime
:
1715159299146
,
processDefinition
:
{
id
:
'pms_contract:5:c7d6012a-29f2-11ef-a08d-0242ac130002'
,
version
:
5
,
deploymentTime
:
1718330818270
,
suspensionState
:
1
}
},
{
key
:
'pms_consult_task_act'
,
name
:
'咨询任务书'
,
description
:
null
,
category
:
'1'
,
categoryName
:
'测试1'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/consultTask/create'
,
formCustomViewPath
:
'/consultTask/detail'
,
id
:
'47fad8e4-0b91-11ef-b841-70b5e844a623'
,
formName
:
null
,
createTime
:
1714990407756
,
processDefinition
:
{
id
:
'pms_consult_task_act:1:67c2ae59-0b91-11ef-b841-70b5e844a623'
,
version
:
1
,
deploymentTime
:
1714990460960
,
suspensionState
:
1
}
},
{
key
:
'pms_project'
,
name
:
'立项管理'
,
description
:
null
,
category
:
'1'
,
categoryName
:
'测试1'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/project/applyProject/create'
,
formCustomViewPath
:
'/project/applyProject/detail'
,
id
:
'f0ba6bde-0b90-11ef-b841-70b5e844a623'
,
formName
:
null
,
createTime
:
1714990261372
,
processDefinition
:
{
id
:
'pms_project:6:b9e4e33b-2c6c-11ef-8386-0242ac130002'
,
version
:
6
,
deploymentTime
:
1718603095738
,
suspensionState
:
1
}
},
{
key
:
'invoice_apply_manage'
,
name
:
'开票申请'
,
description
:
'asdas'
,
category
:
'1'
,
categoryName
:
'测试1'
,
formType
:
20
,
formId
:
null
,
formCustomCreatePath
:
'/sales/invoice/create'
,
formCustomViewPath
:
'/sales/invoice/detail'
,
id
:
'7ec07575-0605-11ef-ab76-cc96e508c010'
,
formName
:
null
,
createTime
:
1714380614292
,
processDefinition
:
{
id
:
'invoice_apply_manage:8:665a8c40-44c9-11ef-9813-0242ac130002'
,
version
:
8
,
deploymentTime
:
1721281726671
,
suspensionState
:
1
}
}
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment