Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
memberTag-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
memberTag
memberTag-web
Commits
5aec3daf
Commit
5aec3daf
authored
May 13, 2022
by
liuchenxi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/5-11修改bug'
parents
01fbe6df
ff4e60fb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
13 deletions
+39
-13
api.js
src/request/api.js
+11
-0
group-list.vue
src/view/memberGroup/group-list.vue
+3
-4
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+20
-4
tags-group.vue
src/view/memberGroup/tags-group.vue
+5
-5
No files found.
src/request/api.js
View file @
5aec3daf
...
@@ -402,3 +402,14 @@ export const isShowSystemTag = (params = {}) =>
...
@@ -402,3 +402,14 @@ export const isShowSystemTag = (params = {}) =>
}
}
})
})
// 查询覆盖人数
export
const
searchRecordPreson
=
(
params
=
{})
=>
request
({
url
:
'/member-es/count-member-by-group-id'
,
method
:
'get'
,
params
:
{
requestProject
:
'gic-member-tag-web'
,
...
params
}
})
src/view/memberGroup/group-list.vue
View file @
5aec3daf
...
@@ -481,7 +481,9 @@ export default {
...
@@ -481,7 +481,9 @@ export default {
color
:
#2F54EB
;
color
:
#2F54EB
;
}
}
.active-li
{
.active-li
{
color
:
#2F54EB
!important
;
span
{
color
:
#2F54EB
!important
;
}
}
}
}
}
.light-group
,
.active-item
{
.light-group
,
.active-item
{
...
@@ -533,9 +535,6 @@ export default {
...
@@ -533,9 +535,6 @@ export default {
}
}
li
:hover
{
li
:hover
{
background-color
:
#EBEFFE
;
background-color
:
#EBEFFE
;
span
{
color
:
#2f54eb
;
}
.icon
{
.icon
{
color
:
#2f54eb
;
color
:
#2f54eb
;
}
}
...
...
src/view/memberGroup/memberGroupList.vue
View file @
5aec3daf
...
@@ -51,8 +51,8 @@
...
@@ -51,8 +51,8 @@
<span
class=
"look-self m-l-10"
v-if=
"[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin"
>
<span
class=
"look-self m-l-10"
v-if=
"[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin"
>
<el-checkbox
v-model=
"isSelf"
>
<el-checkbox
v-model=
"isSelf"
>
仅看本人
仅看本人
<el-tooltip
placement=
"top"
trigger=
"hover"
content=
"其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"
><i
class=
"iconfont icon-QuestionCircleOutlined icon"
/></el-tooltip>
</el-checkbox>
</el-checkbox>
<el-tooltip
placement=
"top"
trigger=
"hover"
content=
"其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"
><i
class=
"iconfont icon-QuestionCircleOutlined icon"
style=
"vertical-align: middle"
/></el-tooltip>
</span>
</span>
<el-button
type=
"primary m-l-10"
v-if=
"$getButtonLimit($buttonCode.memberTagAddGroup)"
:limit-code=
"$buttonCode.memberTagAddGroup"
@
click=
"toAddGroup('fixed')"
class=
"fr"
>
新增分组
</el-button>
<el-button
type=
"primary m-l-10"
v-if=
"$getButtonLimit($buttonCode.memberTagAddGroup)"
:limit-code=
"$buttonCode.memberTagAddGroup"
@
click=
"toAddGroup('fixed')"
class=
"fr"
>
新增分组
</el-button>
<el-button
class=
"btn-foled-all"
@
click=
"$router.push('/memberGroupLog')"
>
分组操作日志
</el-button>
<el-button
class=
"btn-foled-all"
@
click=
"$router.push('/memberGroupLog')"
>
分组操作日志
</el-button>
...
@@ -220,8 +220,8 @@
...
@@ -220,8 +220,8 @@
<span
class=
"look-self m-l-10"
v-if=
"[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin"
>
<span
class=
"look-self m-l-10"
v-if=
"[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin"
>
<el-checkbox
v-model=
"isSelf"
>
<el-checkbox
v-model=
"isSelf"
>
仅看本人
仅看本人
<el-tooltip
placement=
"top"
trigger=
"hover"
content=
"其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"
><i
class=
"iconfont icon-QuestionCircleOutlined icon"
/></el-tooltip>
</el-checkbox>
</el-checkbox>
<el-tooltip
placement=
"top"
trigger=
"hover"
content=
"其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"
><i
class=
"iconfont icon-QuestionCircleOutlined icon"
style=
"vertical-align: middle"
/></el-tooltip>
</span>
</span>
</div>
</div>
<div
class=
"common-wrap__table m-t-20"
>
<div
class=
"common-wrap__table m-t-20"
>
...
@@ -569,7 +569,8 @@ import {
...
@@ -569,7 +569,8 @@ import {
groupCount
,
groupCount
,
gradeList
,
gradeList
,
batchDeleteGroupVerify
,
batchDeleteGroupVerify
,
fixedGroupAddPile
fixedGroupAddPile
,
searchRecordPreson
}
from
'@/request/api'
;
}
from
'@/request/api'
;
import
GroupList
from
'./group-list'
;
import
GroupList
from
'./group-list'
;
import
RecommendTable
from
'./recommend-table'
;
import
RecommendTable
from
'./recommend-table'
;
...
@@ -904,6 +905,8 @@ export default {
...
@@ -904,6 +905,8 @@ export default {
if
(
flag
!=
this
.
activeType
)
return
;
if
(
flag
!=
this
.
activeType
)
return
;
this
.
total
=
res
.
result
.
totalCount
;
this
.
total
=
res
.
result
.
totalCount
;
this
.
groupTableData
=
res
.
result
.
result
;
this
.
groupTableData
=
res
.
result
.
result
;
// 刷新覆盖人数
this
.
refreshRecordPerson
(
this
.
groupTableData
);
}
}
});
});
},
},
...
@@ -965,6 +968,8 @@ export default {
...
@@ -965,6 +968,8 @@ export default {
}
else
{
}
else
{
this
.
groupTableData
=
[];
this
.
groupTableData
=
[];
}
}
// 刷新覆盖人数
this
.
refreshRecordPerson
(
this
.
groupTableData
);
})
})
}
else
{
}
else
{
this
.
isRecommend
=
false
;
this
.
isRecommend
=
false
;
...
@@ -984,6 +989,8 @@ export default {
...
@@ -984,6 +989,8 @@ export default {
}
else
{
}
else
{
this
.
groupTableData
=
[];
this
.
groupTableData
=
[];
}
}
// 刷新覆盖人数
this
.
refreshRecordPerson
(
this
.
groupTableData
);
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
console
.
log
(
err
);
console
.
log
(
err
);
});
});
...
@@ -1332,6 +1339,8 @@ export default {
...
@@ -1332,6 +1339,8 @@ export default {
createTime
:
timeFormat
.
timeToDateTime
(
el
.
createTime
),
createTime
:
timeFormat
.
timeToDateTime
(
el
.
createTime
),
}));
}));
this
.
canEdit
=
(
this
.
groupTableData
[
0
]
||
{}).
canEdit
||
false
;
this
.
canEdit
=
(
this
.
groupTableData
[
0
]
||
{}).
canEdit
||
false
;
// 刷新覆盖人数
this
.
refreshRecordPerson
(
this
.
groupTableData
);
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -1483,6 +1492,13 @@ export default {
...
@@ -1483,6 +1492,13 @@ export default {
this
.
params
.
pageSize
=
20
;
this
.
params
.
pageSize
=
20
;
this
.
currentPage
=
1
;
this
.
currentPage
=
1
;
this
.
params
.
pageNum
=
1
;
this
.
params
.
pageNum
=
1
;
},
refreshRecordPerson
(
arr
)
{
// 刷新覆盖人数
arr
.
forEach
(
async
el
=>
{
const
{
result
}
=
await
searchRecordPreson
({
groupIds
:
el
.
memberTagGroupId
});
el
.
memberCount
=
result
;
})
}
}
},
},
created
()
{
created
()
{
...
@@ -1539,7 +1555,7 @@ export default {
...
@@ -1539,7 +1555,7 @@ export default {
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.icon
{
.icon
{
font-size
:
14px
;
font-size
:
14px
!important
;
color
:
#606266
;
color
:
#606266
;
}
}
.tips
{
.tips
{
...
...
src/view/memberGroup/tags-group.vue
View file @
5aec3daf
...
@@ -101,11 +101,11 @@ export default {
...
@@ -101,11 +101,11 @@ export default {
},
},
// 删除一个标签组
// 删除一个标签组
handleDelTagsGroup
()
{
handleDelTagsGroup
()
{
if
(
this
.
tagsData
.
length
===
0
)
{
//
if (this.tagsData.length === 0) {
this
.
delTagsGroup
();
this
.
delTagsGroup
();
}
else
{
//
} else {
this
.
showDelPop
=
true
;
//
this.showDelPop = true;
}
//
}
},
},
// 添加一个标签
// 添加一个标签
addTags
()
{
addTags
()
{
...
...
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