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
78917cd2
authored
Aug 21, 2023
by
owen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员:增加用户分组
parent
884bb055
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
386 additions
and
6 deletions
+386
-6
src/api/member/group/index.ts
+38
-0
src/views/member/group/GroupForm.vue
+112
-0
src/views/member/group/components/MemberGroupSelect.vue
+46
-0
src/views/member/group/index.vue
+174
-0
src/views/member/level/components/MemberLevelSelect.vue
+1
-1
src/views/member/user/UserForm.vue
+8
-2
src/views/member/user/index.vue
+7
-3
No files found.
src/api/member/group/index.ts
0 → 100644
View file @
78917cd2
import
request
from
'@/config/axios'
export
interface
GroupVO
{
id
:
number
name
:
string
remark
:
string
status
:
number
}
// 查询用户分组列表
export
const
getGroupPage
=
async
(
params
:
any
)
=>
{
return
await
request
.
get
({
url
:
`/member/group/page`
,
params
})
}
// 查询用户分组详情
export
const
getGroup
=
async
(
id
:
number
)
=>
{
return
await
request
.
get
({
url
:
`/member/group/get?id=`
+
id
})
}
// 新增用户分组
export
const
createGroup
=
async
(
data
:
GroupVO
)
=>
{
return
await
request
.
post
({
url
:
`/member/group/create`
,
data
})
}
// 查询用户分组 - 精简信息列表
export
const
getSimpleGroupList
=
async
()
=>
{
return
await
request
.
get
({
url
:
`/member/group/list-all-simple`
})
}
// 修改用户分组
export
const
updateGroup
=
async
(
data
:
GroupVO
)
=>
{
return
await
request
.
put
({
url
:
`/member/group/update`
,
data
})
}
// 删除用户分组
export
const
deleteGroup
=
async
(
id
:
number
)
=>
{
return
await
request
.
delete
({
url
:
`/member/group/delete?id=`
+
id
})
}
src/views/member/group/GroupForm.vue
0 → 100644
View file @
78917cd2
<
template
>
<Dialog
:title=
"dialogTitle"
v-model=
"dialogVisible"
width=
"600"
>
<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=
"备注"
prop=
"remark"
>
<el-input
v-model=
"formData.remark"
type=
"textarea"
placeholder=
"请输入备注"
/>
</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
>
<el-button
@
click=
"submitForm"
type=
"primary"
:disabled=
"formLoading"
>
确 定
</el-button>
<el-button
@
click=
"dialogVisible = false"
>
取 消
</el-button>
</
template
>
</Dialog>
</template>
<
script
setup
lang=
"ts"
>
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
*
as
GroupApi
from
'@/api/member/group'
import
{
CommonStatusEnum
}
from
'@/utils/constants'
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
dialogTitle
=
ref
(
''
)
// 弹窗的标题
const
formLoading
=
ref
(
false
)
// 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
const
formType
=
ref
(
''
)
// 表单的类型:create - 新增;update - 修改
const
formData
=
ref
({
id
:
undefined
,
name
:
undefined
,
remark
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
})
const
formRules
=
reactive
({
name
:
[{
required
:
true
,
message
:
'名称不能为空'
,
trigger
:
'blur'
}],
status
:
[{
required
:
true
,
message
:
'状态不能为空'
,
trigger
:
'blur'
}]
})
const
formRef
=
ref
()
// 表单 Ref
/** 打开弹窗 */
const
open
=
async
(
type
:
string
,
id
?:
number
)
=>
{
dialogVisible
.
value
=
true
dialogTitle
.
value
=
t
(
'action.'
+
type
)
formType
.
value
=
type
resetForm
()
// 修改时,设置数据
if
(
id
)
{
formLoading
.
value
=
true
try
{
formData
.
value
=
await
GroupApi
.
getGroup
(
id
)
}
finally
{
formLoading
.
value
=
false
}
}
}
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
GroupApi
.
GroupVO
if
(
formType
.
value
===
'create'
)
{
await
GroupApi
.
createGroup
(
data
)
message
.
success
(
t
(
'common.createSuccess'
))
}
else
{
await
GroupApi
.
updateGroup
(
data
)
message
.
success
(
t
(
'common.updateSuccess'
))
}
dialogVisible
.
value
=
false
// 发送操作成功的事件
emit
(
'success'
)
}
finally
{
formLoading
.
value
=
false
}
}
/** 重置表单 */
const
resetForm
=
()
=>
{
formData
.
value
=
{
id
:
undefined
,
name
:
undefined
,
remark
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
}
formRef
.
value
?.
resetFields
()
}
</
script
>
src/views/member/group/components/MemberGroupSelect.vue
0 → 100644
View file @
78917cd2
<
template
>
<el-select
v-model=
"groupId"
placeholder=
"请选择用户分组"
clearable
class=
"!w-240px"
>
<el-option
v-for=
"group in groupOptions"
:key=
"group.id"
:label=
"group.name"
:value=
"group.id"
/>
</el-select>
</
template
>
<
script
lang=
"ts"
setup
>
import
*
as
GroupApi
from
'@/api/member/group'
/** 会员分组选择框 **/
defineOptions
({
name
:
'MemberGroupSelect'
})
const
props
=
defineProps
({
/** 下拉框选中值 **/
modelValue
:
{
type
:
Number
,
default
:
undefined
}
})
const
emit
=
defineEmits
([
'update:modelValue'
])
const
groupId
=
computed
({
get
()
{
return
props
.
modelValue
},
set
(
value
:
any
)
{
emit
(
'update:modelValue'
,
value
)
}
})
const
groupOptions
=
ref
<
GroupApi
.
GroupVO
[]
>
([])
const
getList
=
async
()
=>
{
groupOptions
.
value
=
await
GroupApi
.
getSimpleGroupList
()
}
/** 初始化 */
onMounted
(()
=>
{
getList
()
})
</
script
>
src/views/member/group/index.vue
0 → 100644
View file @
78917cd2
<
template
>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class=
"-mb-15px"
:model=
"queryParams"
ref=
"queryFormRef"
:inline=
"true"
label-width=
"68px"
>
<el-form-item
label=
"分组名称"
prop=
"name"
>
<el-input
v-model=
"queryParams.name"
placeholder=
"请输入分组名称"
clearable
@
keyup
.
enter=
"handleQuery"
class=
"!w-240px"
/>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-select
v-model=
"queryParams.status"
placeholder=
"请选择状态"
clearable
class=
"!w-240px"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
: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"
/>
</el-form-item>
<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=
"['member:group:create']"
>
<Icon
icon=
"ep:plus"
class=
"mr-5px"
/>
新增
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading=
"loading"
:data=
"list"
:stripe=
"true"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"编号"
align=
"center"
prop=
"id"
min-width=
"60"
/>
<el-table-column
label=
"名称"
align=
"center"
prop=
"name"
min-width=
"80"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
min-width=
"100"
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
min-width=
"70"
>
<template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.COMMON_STATUS"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
:formatter=
"dateFormatter"
min-width=
"170"
/>
<el-table-column
label=
"操作"
align=
"center"
width=
"150px"
>
<
template
#
default=
"scope"
>
<el-button
link
type=
"primary"
@
click=
"openForm('update', scope.row.id)"
v-hasPermi=
"['member:group:update']"
>
编辑
</el-button>
<el-button
link
type=
"danger"
@
click=
"handleDelete(scope.row.id)"
v-hasPermi=
"['member: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>
<!-- 表单弹窗:添加/修改 -->
<GroupForm
ref=
"formRef"
@
success=
"getList"
/>
</template>
<
script
setup
lang=
"ts"
>
import
{
DICT_TYPE
,
getIntDictOptions
}
from
'@/utils/dict'
import
{
dateFormatter
}
from
'@/utils/formatTime'
import
*
as
GroupApi
from
'@/api/member/group'
import
GroupForm
from
'./GroupForm.vue'
/** 用户分组管理 **/
defineOptions
({
name
:
'MemberGroup'
})
const
message
=
useMessage
()
// 消息弹窗
const
{
t
}
=
useI18n
()
// 国际化
const
loading
=
ref
(
true
)
// 列表的加载中
const
total
=
ref
(
0
)
// 列表的总页数
const
list
=
ref
([])
// 列表的数据
const
queryParams
=
reactive
({
pageNo
:
1
,
pageSize
:
10
,
name
:
null
,
status
:
null
,
createTime
:
[]
})
const
queryFormRef
=
ref
()
// 搜索的表单
/** 查询列表 */
const
getList
=
async
()
=>
{
loading
.
value
=
true
try
{
const
data
=
await
GroupApi
.
getGroupPage
(
queryParams
)
list
.
value
=
data
.
list
total
.
value
=
data
.
total
}
finally
{
loading
.
value
=
false
}
}
/** 搜索按钮操作 */
const
handleQuery
=
()
=>
{
queryParams
.
pageNo
=
1
getList
()
}
/** 重置按钮操作 */
const
resetQuery
=
()
=>
{
queryFormRef
.
value
.
resetFields
()
handleQuery
()
}
/** 添加/修改操作 */
const
formRef
=
ref
()
const
openForm
=
(
type
:
string
,
id
?:
number
)
=>
{
formRef
.
value
.
open
(
type
,
id
)
}
/** 删除按钮操作 */
const
handleDelete
=
async
(
id
:
number
)
=>
{
try
{
// 删除的二次确认
await
message
.
delConfirm
()
// 发起删除
await
GroupApi
.
deleteGroup
(
id
)
message
.
success
(
t
(
'common.delSuccess'
))
// 刷新列表
await
getList
()
}
catch
{}
}
/** 初始化 **/
onMounted
(()
=>
{
getList
()
})
</
script
>
src/views/member/level/components/MemberLevelSelect.vue
View file @
78917cd2
...
...
@@ -18,7 +18,7 @@ defineOptions({ name: 'MemberLevelSelect' })
const
props
=
defineProps
({
/** 下拉框选中值 **/
modelValue
:
{
type
:
Array
,
type
:
Number
,
default
:
undefined
}
})
...
...
src/views/member/user/UserForm.vue
View file @
78917cd2
...
...
@@ -76,6 +76,9 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item
label=
"用户分组"
prop=
"groupId"
>
<MemberGroupSelect
v-model=
"formData.groupId"
/>
</el-form-item>
<el-form-item
label=
"会员备注"
prop=
"mark"
>
<el-input
type=
"textarea"
v-model=
"formData.mark"
placeholder=
"请输入会员备注"
/>
</el-form-item>
...
...
@@ -93,6 +96,7 @@ import * as AreaApi from '@/api/system/area'
import
{
defaultProps
}
from
'@/utils/tree'
import
MemberTagSelect
from
'@/views/member/tag/components/MemberTagSelect.vue'
import
MemberLevelSelect
from
'@/views/member/level/components/MemberLevelSelect.vue'
import
MemberGroupSelect
from
'@/views/member/group/components/MemberGroupSelect.vue'
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
...
...
@@ -115,7 +119,8 @@ const formData = ref({
mark
:
undefined
,
tagIds
:
[],
levelId
:
undefined
,
levelReason
:
undefined
levelReason
:
undefined
,
groupId
:
undefined
})
const
formRules
=
reactive
({
mobile
:
[{
required
:
true
,
message
:
'手机号不能为空'
,
trigger
:
'blur'
}],
...
...
@@ -190,7 +195,8 @@ const resetForm = () => {
mark
:
undefined
,
tagIds
:
[],
levelId
:
undefined
,
levelReason
:
undefined
levelReason
:
undefined
,
groupId
:
undefined
}
formRef
.
value
?.
resetFields
()
}
...
...
src/views/member/user/index.vue
View file @
78917cd2
...
...
@@ -54,6 +54,9 @@
<el-form-item
label=
"用户等级"
prop=
"levelId"
>
<MemberLevelSelect
v-model=
"queryParams.levelId"
/>
</el-form-item>
<el-form-item
label=
"用户分组"
prop=
"groupId"
>
<MemberGroupSelect
v-model=
"queryParams.groupId"
/>
</el-form-item>
<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>
...
...
@@ -73,8 +76,7 @@
<el-table-column
label=
"手机号"
align=
"center"
prop=
"mobile"
width=
"120px"
/>
<el-table-column
label=
"昵称"
align=
"center"
prop=
"nickname"
width=
"80px"
/>
<el-table-column
label=
"等级"
align=
"center"
prop=
"levelName"
width=
"100px"
/>
<!-- TODO 芋艿:待接入 -->
<el-table-column
label=
"分组"
align=
"center"
width=
"100px"
/>
<el-table-column
label=
"分组"
align=
"center"
prop=
"groupName"
width=
"100px"
/>
<el-table-column
label=
"用户标签"
align=
"center"
...
...
@@ -137,6 +139,7 @@ import UserForm from './UserForm.vue'
import
{
DICT_TYPE
}
from
'@/utils/dict'
import
MemberTagSelect
from
'@/views/member/tag/components/MemberTagSelect.vue'
import
MemberLevelSelect
from
'@/views/member/level/components/MemberLevelSelect.vue'
import
MemberGroupSelect
from
'@/views/member/group/components/MemberGroupSelect.vue'
defineOptions
({
name
:
'MemberUser'
})
...
...
@@ -151,7 +154,8 @@ const queryParams = reactive({
loginDate
:
[],
createTime
:
[],
tagIds
:
[],
levelId
:
null
levelId
:
null
,
groupId
:
null
})
const
queryFormRef
=
ref
()
// 搜索的表单
...
...
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