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
67de9fc5
authored
Mar 22, 2023
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Vue3 重构:工作流分组
parent
812300cc
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
307 additions
and
236 deletions
+307
-236
src/api/bpm/userGroup/index.ts
+6
-6
src/api/system/user/index.ts
+1
-1
src/types/auto-components.d.ts
+1
-0
src/views/bpm/group/UserGroupForm.vue
+132
-0
src/views/bpm/group/group.data.ts
+0
-64
src/views/bpm/group/index.vue
+158
-156
src/views/bpm/processInstance/detail.vue
+1
-1
src/views/bpm/taskAssignRule/index.vue
+4
-4
src/views/system/dept/index.vue
+2
-2
src/views/system/notify/template/index.vue
+2
-2
No files found.
src/api/bpm/userGroup/index.ts
View file @
67de9fc5
...
@@ -11,7 +11,7 @@ export type UserGroupVO = {
...
@@ -11,7 +11,7 @@ export type UserGroupVO = {
}
}
// 创建用户组
// 创建用户组
export
const
createUserGroup
Api
=
async
(
data
:
UserGroupVO
)
=>
{
export
const
createUserGroup
=
async
(
data
:
UserGroupVO
)
=>
{
return
await
request
.
post
({
return
await
request
.
post
({
url
:
'/bpm/user-group/create'
,
url
:
'/bpm/user-group/create'
,
data
:
data
data
:
data
...
@@ -19,7 +19,7 @@ export const createUserGroupApi = async (data: UserGroupVO) => {
...
@@ -19,7 +19,7 @@ export const createUserGroupApi = async (data: UserGroupVO) => {
}
}
// 更新用户组
// 更新用户组
export
const
updateUserGroup
Api
=
async
(
data
:
UserGroupVO
)
=>
{
export
const
updateUserGroup
=
async
(
data
:
UserGroupVO
)
=>
{
return
await
request
.
put
({
return
await
request
.
put
({
url
:
'/bpm/user-group/update'
,
url
:
'/bpm/user-group/update'
,
data
:
data
data
:
data
...
@@ -27,21 +27,21 @@ export const updateUserGroupApi = async (data: UserGroupVO) => {
...
@@ -27,21 +27,21 @@ export const updateUserGroupApi = async (data: UserGroupVO) => {
}
}
// 删除用户组
// 删除用户组
export
const
deleteUserGroup
Api
=
async
(
id
:
number
)
=>
{
export
const
deleteUserGroup
=
async
(
id
:
number
)
=>
{
return
await
request
.
delete
({
url
:
'/bpm/user-group/delete?id='
+
id
})
return
await
request
.
delete
({
url
:
'/bpm/user-group/delete?id='
+
id
})
}
}
// 获得用户组
// 获得用户组
export
const
getUserGroup
Api
=
async
(
id
:
number
)
=>
{
export
const
getUserGroup
=
async
(
id
:
number
)
=>
{
return
await
request
.
get
({
url
:
'/bpm/user-group/get?id='
+
id
})
return
await
request
.
get
({
url
:
'/bpm/user-group/get?id='
+
id
})
}
}
// 获得用户组分页
// 获得用户组分页
export
const
getUserGroupPage
Api
=
async
(
params
)
=>
{
export
const
getUserGroupPage
=
async
(
params
)
=>
{
return
await
request
.
get
({
url
:
'/bpm/user-group/page'
,
params
})
return
await
request
.
get
({
url
:
'/bpm/user-group/page'
,
params
})
}
}
// 获取用户组精简信息列表
// 获取用户组精简信息列表
export
const
listSimpleUserGroup
sApi
=
async
()
=>
{
export
const
listSimpleUserGroup
=
async
()
=>
{
return
await
request
.
get
({
url
:
'/bpm/user-group/list-all-simple'
})
return
await
request
.
get
({
url
:
'/bpm/user-group/list-all-simple'
})
}
}
src/api/system/user/index.ts
View file @
67de9fc5
...
@@ -86,6 +86,6 @@ export const updateUserStatusApi = (id: number, status: number) => {
...
@@ -86,6 +86,6 @@ export const updateUserStatusApi = (id: number, status: number) => {
}
}
// 获取用户精简信息列表
// 获取用户精简信息列表
export
const
get
ListSimpleUsersApi
=
()
=>
{
export
const
get
SimpleUserList
=
()
=>
{
return
request
.
get
({
url
:
'/system/user/list-all-simple'
})
return
request
.
get
({
url
:
'/system/user/list-all-simple'
})
}
}
src/types/auto-components.d.ts
View file @
67de9fc5
...
@@ -30,6 +30,7 @@ declare module '@vue/runtime-core' {
...
@@ -30,6 +30,7 @@ declare module '@vue/runtime-core' {
ElButtonGroup
:
typeof
import
(
'element-plus/es'
)[
'ElButtonGroup'
]
ElButtonGroup
:
typeof
import
(
'element-plus/es'
)[
'ElButtonGroup'
]
ElCard
:
typeof
import
(
'element-plus/es'
)[
'ElCard'
]
ElCard
:
typeof
import
(
'element-plus/es'
)[
'ElCard'
]
ElCheckbox
:
typeof
import
(
'element-plus/es'
)[
'ElCheckbox'
]
ElCheckbox
:
typeof
import
(
'element-plus/es'
)[
'ElCheckbox'
]
ElCheckboxGroup
:
typeof
import
(
'element-plus/es'
)[
'ElCheckboxGroup'
]
ElCol
:
typeof
import
(
'element-plus/es'
)[
'ElCol'
]
ElCol
:
typeof
import
(
'element-plus/es'
)[
'ElCol'
]
ElCollapse
:
typeof
import
(
'element-plus/es'
)[
'ElCollapse'
]
ElCollapse
:
typeof
import
(
'element-plus/es'
)[
'ElCollapse'
]
ElCollapseItem
:
typeof
import
(
'element-plus/es'
)[
'ElCollapseItem'
]
ElCollapseItem
:
typeof
import
(
'element-plus/es'
)[
'ElCollapseItem'
]
...
...
src/views/bpm/group/UserGroupForm.vue
0 → 100644
View file @
67de9fc5
<
template
>
<Dialog
:title=
"modelTitle"
v-model=
"modelVisible"
>
<el-form
ref=
"formRef"
:model=
"formData"
:rules=
"formRules"
label-width=
"100px"
v-loading=
"formLoading"
>
<el-form-item
label=
"组名"
prop=
"name"
>
<el-input
v-model=
"formData.name"
placeholder=
"请输入组名"
/>
</el-form-item>
<el-form-item
label=
"描述"
>
<el-input
type=
"textarea"
v-model=
"formData.name"
placeholder=
"请输入描述"
/>
</el-form-item>
<el-form-item
label=
"成员"
prop=
"memberUserIds"
>
<el-select
v-model=
"formData.memberUserIds"
multiple
placeholder=
"请选择成员"
>
<el-option
v-for=
"user in userList"
:key=
"user.id"
:label=
"user.nickname"
:value=
"user.id"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-radio-group
v-model=
"formData.status"
>
<el-radio
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key=
"dict.value"
:label=
"dict.value"
>
{{
dict
.
label
}}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template
#
footer
>
<div
class=
"dialog-footer"
>
<el-button
@
click=
"submitForm"
type=
"primary"
:disabled=
"formLoading"
>
确 定
</el-button>
<el-button
@
click=
"modelVisible = false"
>
取 消
</el-button>
</div>
</
template
>
</Dialog>
</template>
<
script
setup
lang=
"ts"
>
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
{
CommonStatusEnum
}
from
'@/utils/constants'
import
*
as
UserGroupApi
from
'@/api/bpm/userGroup'
import
*
as
UserApi
from
'@/api/system/user'
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
modelVisible
=
ref
(
false
)
// 弹窗的是否展示
const
modelTitle
=
ref
(
''
)
// 弹窗的标题
const
formLoading
=
ref
(
false
)
// 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
const
formType
=
ref
(
''
)
// 表单的类型:create - 新增;update - 修改
const
formData
=
ref
({
id
:
undefined
,
name
:
undefined
,
description
:
undefined
,
memberUserIds
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
})
const
formRules
=
reactive
({
name
:
[{
required
:
true
,
message
:
'组名不能为空'
,
trigger
:
'blur'
}],
description
:
[{
required
:
true
,
message
:
'描述不能为空'
,
trigger
:
'blur'
}],
memberUserIds
:
[{
required
:
true
,
message
:
'成员不能为空'
,
trigger
:
'blur'
}],
status
:
[{
required
:
true
,
message
:
'状态不能为空'
,
trigger
:
'blur'
}]
})
const
formRef
=
ref
()
// 表单 Ref
const
userList
=
ref
([])
// 用户列表
/** 打开弹窗 */
const
open
=
async
(
type
:
string
,
id
?:
number
)
=>
{
modelVisible
.
value
=
true
modelTitle
.
value
=
t
(
'action.'
+
type
)
formType
.
value
=
type
resetForm
()
// 修改时,设置数据
if
(
id
)
{
formLoading
.
value
=
true
try
{
formData
.
value
=
await
UserGroupApi
.
getUserGroup
(
id
)
}
finally
{
formLoading
.
value
=
false
}
}
// 加载用户列表
userList
.
value
=
await
UserApi
.
getSimpleUserList
()
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
/** 提交表单 */
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
const
submitForm
=
async
()
=>
{
// 校验表单
if
(
!
formRef
)
return
const
valid
=
await
formRef
.
value
.
validate
()
if
(
!
valid
)
return
// 提交请求
formLoading
.
value
=
true
try
{
const
data
=
formData
.
value
as
unknown
as
UserGroupApi
.
UserGroupVO
if
(
formType
.
value
===
'create'
)
{
await
UserGroupApi
.
createUserGroup
(
data
)
message
.
success
(
t
(
'common.createSuccess'
))
}
else
{
await
UserGroupApi
.
updateUserGroup
(
data
)
message
.
success
(
t
(
'common.updateSuccess'
))
}
modelVisible
.
value
=
false
// 发送操作成功的事件
emit
(
'success'
)
}
finally
{
formLoading
.
value
=
false
}
}
/** 重置表单 */
const
resetForm
=
()
=>
{
formData
.
value
=
{
id
:
undefined
,
name
:
undefined
,
description
:
undefined
,
memberUserIds
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
}
formRef
.
value
?.
resetFields
()
}
</
script
>
src/views/bpm/group/group.data.ts
deleted
100644 → 0
View file @
812300cc
import
type
{
VxeCrudSchema
}
from
'@/hooks/web/useVxeCrudSchemas'
const
{
t
}
=
useI18n
()
// 国际化
// 表单校验
export
const
rules
=
reactive
({
name
:
[
required
],
description
:
[
required
],
memberUserIds
:
[
required
],
status
:
[
required
]
})
// CrudSchema
const
crudSchemas
=
reactive
<
VxeCrudSchema
>
({
primaryKey
:
'id'
,
primaryType
:
'id'
,
primaryTitle
:
'编号'
,
action
:
true
,
searchSpan
:
8
,
columns
:
[
{
title
:
'组名'
,
field
:
'name'
,
isSearch
:
true
},
{
title
:
'成员'
,
field
:
'memberUserIds'
,
table
:
{
slots
:
{
default
:
'memberUserIds_default'
}
}
},
{
title
:
'描述'
,
field
:
'description'
},
{
title
:
t
(
'common.status'
),
field
:
'status'
,
dictType
:
DICT_TYPE
.
COMMON_STATUS
,
dictClass
:
'number'
,
isSearch
:
true
},
{
title
:
t
(
'common.createTime'
),
field
:
'createTime'
,
formatter
:
'formatDate'
,
isForm
:
false
,
isSearch
:
true
,
search
:
{
show
:
true
,
itemRender
:
{
name
:
'XDataTimePicker'
}
},
table
:
{
width
:
180
}
}
]
})
export
const
{
allSchemas
}
=
useVxeCrudSchemas
(
crudSchemas
)
src/views/bpm/group/index.vue
View file @
67de9fc5
<
template
>
<
template
>
<ContentWrap>
<ContentWrap>
<!-- 列表 -->
<!-- 搜索工作栏 -->
<XTable
@
register=
"registerTable"
>
<el-form
<template
#
toolbar_buttons
>
class=
"-mb-15px"
<!-- 操作:新增 -->
:model=
"queryParams"
<XButton
ref=
"queryFormRef"
type=
"primary"
:inline=
"true"
preIcon=
"ep:zoom-in"
label-width=
"68px"
:title=
"t('action.add')"
>
v-hasPermi=
"['bpm:user-group:create']"
<el-form-item
label=
"组名"
prop=
"name"
>
@
click=
"handleCreate()"
<el-input
/>
v-model=
"queryParams.name"
</
template
>
placeholder=
"请输入组名"
<
template
#
memberUserIds_default=
"{ row }"
>
clearable
<span
v-for=
"userId in row.memberUserIds"
:key=
"userId"
>
@
keyup
.
enter=
"handleQuery"
{{
getUserNickname
(
userId
)
}}
class=
"!w-240px"
</span>
</
template
>
<
template
#
actionbtns_default=
"{ row }"
>
<!-- 操作:修改 -->
<XTextButton
preIcon=
"ep:edit"
:title=
"t('action.edit')"
v-hasPermi=
"['bpm:user-group:update']"
@
click=
"handleUpdate(row.id)"
/>
<!-- 操作:详情 -->
<XTextButton
preIcon=
"ep:view"
:title=
"t('action.detail')"
v-hasPermi=
"['bpm:user-group:query']"
@
click=
"handleDetail(row.id)"
/>
/>
<!-- 操作:删除 -->
</el-form-item>
<XTextButton
<el-form-item
label=
"状态"
prop=
"status"
>
preIcon=
"ep:delete"
<el-select
v-model=
"queryParams.status"
placeholder=
"请选择状态"
clearable
class=
"!w-240px"
>
:title=
"t('action.del')"
<el-option
v-hasPermi=
"['bpm:user-group:delete']"
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@
click=
"deleteData(row.id)"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"创建时间"
prop=
"createTime"
>
<el-date-picker
v-model=
"queryParams.createTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"daterange"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class=
"!w-240px"
/>
/>
</
template
>
</el-form-item>
</XTable>
<el-form-item>
<el-button
@
click=
"handleQuery"
><Icon
icon=
"ep:search"
class=
"mr-5px"
/>
搜索
</el-button>
<el-button
@
click=
"resetQuery"
><Icon
icon=
"ep:refresh"
class=
"mr-5px"
/>
重置
</el-button>
<el-button
type=
"primary"
@
click=
"openForm('create')"
v-hasPermi=
"['bpm:user-group:create']"
>
<Icon
icon=
"ep:plus"
class=
"mr-5px"
/>
新增
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
</ContentWrap>
<XModal
v-model=
"dialogVisible"
:title=
"dialogTitle"
:mask-closable=
"false"
>
<!-- 列表 -->
<!-- 对话框(添加 / 修改) -->
<ContentWrap>
<Form
<el-table
v-loading=
"loading"
:data=
"list"
>
v-if=
"['create', 'update'].includes(actionType)"
<el-table-column
label=
"编号"
align=
"center"
prop=
"id"
/>
:schema=
"allSchemas.formSchema"
<el-table-column
label=
"组名"
align=
"center"
prop=
"name"
/>
:rules=
"rules"
<el-table-column
label=
"描述"
align=
"center"
prop=
"description"
/>
ref=
"formRef"
<el-table-column
label=
"成员"
align=
"center"
>
>
<template
#
default=
"scope"
>
<
template
#
memberUserIds=
"form"
>
<span
v-for=
"userId in scope.row.memberUserIds"
:key=
"userId"
class=
"pr-5px"
>
<el-select
v-model=
"form.memberUserIds"
multiple
>
{{
userList
.
find
((
user
)
=>
user
.
id
===
userId
)?.
nickname
}}
<el-option
v-for=
"item in users"
:key=
"item.id"
:label=
"item.nickname"
:value=
"item.id"
/>
</span>
</el-select>
</
template
>
</
template
>
</el-table-column>
</Form>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
>
<!-- 对话框(详情) -->
<
template
#
default=
"scope"
>
<Descriptions
<dict-tag
:type=
"DICT_TYPE.COMMON_STATUS"
:value=
"scope.row.status"
/>
v-if=
"actionType === 'detail'"
</
template
>
:schema=
"allSchemas.detailSchema"
</el-table-column>
:data=
"detailData"
<el-table-column
>
label=
"创建时间"
<
template
#
memberUserIds=
"{ row }"
>
align=
"center"
<span
v-for=
"userId in row.memberUserIds"
:key=
"userId"
>
prop=
"createTime"
{{
getUserNickname
(
userId
)
}}
:formatter=
"dateFormatter"
</span>
</
template
>
</Descriptions>
<!-- 操作按钮 -->
<
template
#
footer
>
<!-- 按钮:保存 -->
<XButton
v-if=
"['create', 'update'].includes(actionType)"
type=
"primary"
:title=
"t('action.save')"
:loading=
"actionLoading"
@
click=
"submitForm"
/>
/>
<!-- 按钮:关闭 -->
<el-table-column
label=
"操作"
align=
"center"
>
<XButton
:loading=
"actionLoading"
:title=
"t('dialog.close')"
@
click=
"dialogVisible = false"
/>
<
template
#
default=
"scope"
>
</
template
>
<el-button
</XModal>
link
type=
"primary"
@
click=
"openForm('update', scope.row.id)"
v-hasPermi=
"['bpm:user-group:update']"
>
编辑
</el-button>
<el-button
link
type=
"danger"
@
click=
"handleDelete(scope.row.id)"
v-hasPermi=
"['bpm:user-group:delete']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total=
"total"
v-model:page=
"queryParams.pageNo"
v-model:limit=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</ContentWrap>
<!-- 表单弹窗:添加/修改 -->
<UserGroupForm
ref=
"formRef"
@
success=
"getList"
/>
</template>
</template>
<
script
setup
lang=
"ts"
>
<
script
setup
lang=
"ts"
name=
"UserGroup"
>
// 业务相关的 import
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
{
dateFormatter
}
from
'@/utils/formatTime'
import
*
as
UserGroupApi
from
'@/api/bpm/userGroup'
import
*
as
UserGroupApi
from
'@/api/bpm/userGroup'
import
{
getListSimpleUsersApi
,
UserVO
}
from
'@/api/system/user'
import
*
as
UserApi
from
'@/api/system/user'
import
{
allSchemas
,
rules
}
from
'./group.data'
import
UserGroupForm
from
'./UserGroupForm.vue'
import
{
FormExpose
}
from
'@/components/Form'
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
message
=
useMessage
()
// 消息弹窗
// 列表相关的变量
const
{
t
}
=
useI18n
()
// 国际化
const
[
registerTable
,
{
reload
,
deleteData
}]
=
useXTable
({
allSchemas
:
allSchemas
,
const
loading
=
ref
(
true
)
// 列表的加载中
getListApi
:
UserGroupApi
.
getUserGroupPageApi
,
const
total
=
ref
(
0
)
// 列表的总页数
deleteApi
:
UserGroupApi
.
deleteUserGroupApi
const
list
=
ref
([])
// 列表的数据
const
queryParams
=
reactive
({
pageNo
:
1
,
pageSize
:
10
,
name
:
null
,
status
:
null
,
createTime
:
[]
})
})
// 用户列表
const
queryFormRef
=
ref
()
// 搜索的表单
const
user
s
=
ref
<
UserVO
[]
>
([])
const
user
List
=
ref
([])
// 用户列表
const
getUserNickname
=
(
userId
)
=>
{
/** 查询参数列表 */
for
(
const
user
of
users
.
value
)
{
const
getList
=
async
()
=>
{
if
(
user
.
id
===
userId
)
{
loading
.
value
=
true
return
user
.
nickname
try
{
}
const
data
=
await
UserGroupApi
.
getUserGroupPage
(
queryParams
)
list
.
value
=
data
.
list
total
.
value
=
data
.
total
}
finally
{
loading
.
value
=
false
}
}
return
'未知('
+
userId
+
')'
}
// ========== CRUD 相关 ==========
const
actionLoading
=
ref
(
false
)
// 遮罩层
const
actionType
=
ref
(
''
)
// 操作按钮的类型
const
dialogVisible
=
ref
(
false
)
// 是否显示弹出层
const
dialogTitle
=
ref
(
'edit'
)
// 弹出层标题
const
formRef
=
ref
<
FormExpose
>
()
// 表单 Ref
const
detailData
=
ref
()
// 详情 Ref
// 设置标题
const
setDialogTile
=
(
type
:
string
)
=>
{
dialogTitle
.
value
=
t
(
'action.'
+
type
)
actionType
.
value
=
type
dialogVisible
.
value
=
true
}
}
// 新增操作
/** 搜索按钮操作 */
const
handleCreate
=
()
=>
{
const
handleQuery
=
()
=>
{
setDialogTile
(
'create'
)
queryParams
.
pageNo
=
1
getList
()
}
}
// 修改操作
/** 重置按钮操作 */
const
handleUpdate
=
async
(
rowId
:
number
)
=>
{
const
resetQuery
=
()
=>
{
setDialogTile
(
'update'
)
queryFormRef
.
value
.
resetFields
()
// 设置数据
handleQuery
()
const
res
=
await
UserGroupApi
.
getUserGroupApi
(
rowId
)
unref
(
formRef
)?.
setValues
(
res
)
}
}
/
/ 详情操作
/
** 添加/修改操作 */
const
handleDetail
=
async
(
rowId
:
number
)
=>
{
const
formRef
=
ref
()
setDialogTile
(
'detail'
)
const
openForm
=
(
type
:
string
,
id
?:
number
)
=>
{
detailData
.
value
=
await
UserGroupApi
.
getUserGroupApi
(
rowI
d
)
formRef
.
value
.
open
(
type
,
i
d
)
}
}
// 提交按钮
/** 删除按钮操作 */
const
submitForm
=
async
()
=>
{
const
handleDelete
=
async
(
id
:
number
)
=>
{
const
elForm
=
unref
(
formRef
)?.
getElFormRef
()
try
{
if
(
!
elForm
)
return
// 删除的二次确认
elForm
.
validate
(
async
(
valid
)
=>
{
await
message
.
delConfirm
()
if
(
valid
)
{
// 发起删除
actionLoading
.
value
=
true
await
UserGroupApi
.
deleteUserGroup
(
id
)
// 提交请求
message
.
success
(
t
(
'common.delSuccess'
))
try
{
// 刷新列表
const
data
=
unref
(
formRef
)?.
formModel
as
UserGroupApi
.
UserGroupVO
await
getList
()
if
(
actionType
.
value
===
'create'
)
{
}
catch
{}
await
UserGroupApi
.
createUserGroupApi
(
data
)
message
.
success
(
t
(
'common.createSuccess'
))
}
else
{
await
UserGroupApi
.
updateUserGroupApi
(
data
)
message
.
success
(
t
(
'common.updateSuccess'
))
}
dialogVisible
.
value
=
false
}
finally
{
actionLoading
.
value
=
false
// 刷新列表
await
reload
()
}
}
})
}
}
/
/ ========== 初始化 ==========
/
** 初始化 **/
onMounted
(()
=>
{
onMounted
(
async
()
=>
{
getListSimpleUsersApi
().
then
((
data
)
=>
{
await
getList
()
users
.
value
=
data
// 加载用户列表
}
)
userList
.
value
=
await
UserApi
.
getSimpleUserList
(
)
})
})
</
script
>
</
script
>
src/views/bpm/processInstance/detail.vue
View file @
67de9fc5
...
@@ -378,7 +378,7 @@ onMounted(() => {
...
@@ -378,7 +378,7 @@ onMounted(() => {
// 加载详情
// 加载详情
getDetail
()
getDetail
()
// 加载用户的列表
// 加载用户的列表
UserApi
.
get
ListSimpleUsersApi
().
then
((
data
)
=>
{
UserApi
.
get
SimpleUserList
().
then
((
data
)
=>
{
userOptions
.
value
.
push
(...
data
)
userOptions
.
value
.
push
(...
data
)
})
})
})
})
...
...
src/views/bpm/taskAssignRule/index.vue
View file @
67de9fc5
...
@@ -140,8 +140,8 @@ import { FormInstance } from 'element-plus'
...
@@ -140,8 +140,8 @@ import { FormInstance } from 'element-plus'
import
*
as
TaskAssignRuleApi
from
'@/api/bpm/taskAssignRule'
import
*
as
TaskAssignRuleApi
from
'@/api/bpm/taskAssignRule'
import
{
listSimpleRolesApi
}
from
'@/api/system/role'
import
{
listSimpleRolesApi
}
from
'@/api/system/role'
import
{
listSimplePostsApi
}
from
'@/api/system/post'
import
{
listSimplePostsApi
}
from
'@/api/system/post'
import
{
get
ListSimpleUsersApi
}
from
'@/api/system/user'
import
{
get
SimpleUserList
}
from
'@/api/system/user'
import
{
listSimpleUserGroup
sApi
}
from
'@/api/bpm/userGroup'
import
{
listSimpleUserGroup
}
from
'@/api/bpm/userGroup'
import
{
listSimpleDeptApi
}
from
'@/api/system/dept'
import
{
listSimpleDeptApi
}
from
'@/api/system/dept'
import
{
DICT_TYPE
,
getDictOptions
}
from
'@/utils/dict'
import
{
DICT_TYPE
,
getDictOptions
}
from
'@/utils/dict'
import
{
handleTree
,
defaultProps
}
from
'@/utils/tree'
import
{
handleTree
,
defaultProps
}
from
'@/utils/tree'
...
@@ -341,12 +341,12 @@ onMounted(() => {
...
@@ -341,12 +341,12 @@ onMounted(() => {
})
})
// 获得用户列表
// 获得用户列表
userOptions
.
value
=
[]
userOptions
.
value
=
[]
get
ListSimpleUsersApi
().
then
((
data
)
=>
{
get
SimpleUserList
().
then
((
data
)
=>
{
userOptions
.
value
.
push
(...
data
)
userOptions
.
value
.
push
(...
data
)
})
})
// 获得用户组列表
// 获得用户组列表
userGroupOptions
.
value
=
[]
userGroupOptions
.
value
=
[]
listSimpleUserGroup
sApi
().
then
((
data
)
=>
{
listSimpleUserGroup
().
then
((
data
)
=>
{
userGroupOptions
.
value
.
push
(...
data
)
userGroupOptions
.
value
.
push
(...
data
)
})
})
if
(
!
isShow
)
{
if
(
!
isShow
)
{
...
...
src/views/system/dept/index.vue
View file @
67de9fc5
...
@@ -79,7 +79,7 @@ import { handleTree, defaultProps } from '@/utils/tree'
...
@@ -79,7 +79,7 @@ import { handleTree, defaultProps } from '@/utils/tree'
import
type
{
FormExpose
}
from
'@/components/Form'
import
type
{
FormExpose
}
from
'@/components/Form'
import
{
allSchemas
,
rules
}
from
'./dept.data'
import
{
allSchemas
,
rules
}
from
'./dept.data'
import
*
as
DeptApi
from
'@/api/system/dept'
import
*
as
DeptApi
from
'@/api/system/dept'
import
{
get
ListSimpleUsersApi
,
UserVO
}
from
'@/api/system/user'
import
{
get
SimpleUserList
,
UserVO
}
from
'@/api/system/user'
const
{
t
}
=
useI18n
()
// 国际化
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
message
=
useMessage
()
// 消息弹窗
...
@@ -102,7 +102,7 @@ const deptOptions = ref() // 树形结构
...
@@ -102,7 +102,7 @@ const deptOptions = ref() // 树形结构
const
userOption
=
ref
<
UserVO
[]
>
([])
const
userOption
=
ref
<
UserVO
[]
>
([])
const
getUserList
=
async
()
=>
{
const
getUserList
=
async
()
=>
{
const
res
=
await
get
ListSimpleUsersApi
()
const
res
=
await
get
SimpleUserList
()
userOption
.
value
=
res
userOption
.
value
=
res
}
}
// 获取下拉框[上级]的数据
// 获取下拉框[上级]的数据
...
...
src/views/system/notify/template/index.vue
View file @
67de9fc5
...
@@ -119,7 +119,7 @@ import { FormExpose } from '@/components/Form'
...
@@ -119,7 +119,7 @@ import { FormExpose } from '@/components/Form'
// 业务相关的 import
// 业务相关的 import
import
{
rules
,
allSchemas
}
from
'./template.data'
import
{
rules
,
allSchemas
}
from
'./template.data'
import
*
as
NotifyTemplateApi
from
'@/api/system/notify/template'
import
*
as
NotifyTemplateApi
from
'@/api/system/notify/template'
import
{
get
ListSimpleUsersApi
,
UserVO
}
from
'@/api/system/user'
import
{
get
SimpleUserList
,
UserVO
}
from
'@/api/system/user'
const
{
t
}
=
useI18n
()
// 国际化
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
message
=
useMessage
()
// 消息弹窗
...
@@ -244,7 +244,7 @@ const sendTest = async () => {
...
@@ -244,7 +244,7 @@ const sendTest = async () => {
// ========== 初始化 ==========
// ========== 初始化 ==========
onMounted
(()
=>
{
onMounted
(()
=>
{
get
ListSimpleUsersApi
().
then
((
data
)
=>
{
get
SimpleUserList
().
then
((
data
)
=>
{
userOption
.
value
=
data
userOption
.
value
=
data
})
})
})
})
...
...
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