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
2c232544
Commit
2c232544
authored
Nov 16, 2018
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
1c2c9ecd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
6 deletions
+32
-6
groupTransfer.vue
src/components/groupTransfer.vue
+15
-1
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+17
-5
No files found.
src/components/groupTransfer.vue
View file @
2c232544
...
...
@@ -224,7 +224,7 @@
*/
getGroupList
()
{
const
that
=
this
;
that
.
axios
.
get
(
`
${
that
.
baseUrl
}
/gic-member-tag-web/member-tag-group/findList.json?requestProject=
${
that
.
projectName
}
&pageSize=
${
that
.
pageSize
}
&pageNum=
${
that
.
currentPage
}
&groupName=
${
that
.
dataSearch
}
`
)
that
.
axios
.
get
(
`
${
that
.
baseUrl
}
/gic-member-tag-web/member-tag-group/findList.json?requestProject=
${
that
.
projectName
}
&pageSize=
${
that
.
pageSize
}
&pageNum=
${
that
.
currentPage
}
&groupName=
${
that
.
dataSearch
}
&effectiveStatus=
${
1
}
`
)
.
then
(
res
=>
{
if
(
res
.
data
.
errorCode
==
1
)
{
that
.
tableData
=
that
.
tableData
.
concat
(
res
.
data
.
result
.
result
);
...
...
@@ -267,6 +267,13 @@
},
selectToTransfer
()
{
if
(
this
.
selectionToTransfer
.
length
<
1
)
{
this
.
$message
.
error
({
duration
:
1000
,
message
:
'请选择分组!'
});
return
false
;
}
this
.
selectedData
=
this
.
uniqueByGroupId
(
this
.
selectedData
.
concat
(
this
.
selectionToTransfer
));
// 数组拼接并去重
this
.
getMemberCountByGroups
();
this
.
$emit
(
'handleDataTransferred'
,
this
.
selectedData
,
this
.
selectionToTransfer
);
...
...
@@ -308,6 +315,13 @@
},
selectToRemove
()
{
if
(
this
.
selectionToRemove
.
length
<
1
)
{
this
.
$message
.
error
({
duration
:
1000
,
message
:
'请选择分组!'
});
return
false
;
}
let
seleced
=
this
.
selectedData
;
let
setection
=
this
.
selectionToRemove
;
let
aSet
=
new
Set
(
seleced
);
...
...
src/view/memberGroup/memberGroupList.vue
View file @
2c232544
...
...
@@ -18,6 +18,7 @@
<div
class=
"common-wrap__table m-t-20"
>
<el-table
v-loading=
"loading"
:row-class-name=
"setRowClassName"
ref=
"multipleTable"
:data=
"groupTableData"
tooltip-effect=
"dark"
...
...
@@ -59,7 +60,7 @@
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<!--
{{
scope
.
row
.
updateType
==
1
?
'每天一次'
:
scope
.
row
.
updateType
==
2
?
(
scope
.
row
.
updateDay
?
'每周'
+
weekArr
[
scope
.
row
.
updateDay
-
1
]
:
'每周一次'
)
:
(
scope
.
row
.
updateDay
?
'每月'
+
scope
.
row
.
updateDay
+
'号'
:
'每月一次'
)
}}
-->
<template
v-if=
"scope.row.isRealTime ==
1
"
>
<template
v-if=
"scope.row.isRealTime ==
0
"
>
{{
scope
.
row
.
updateType
,
scope
.
row
.
updateDay
|
formatUpdateFrequency
}}
</
template
>
<
template
v-else
>
...
...
@@ -148,6 +149,7 @@
import
timeFormat
from
'@/common/js/timeFormat'
;
import
{
_debounce
}
from
"@/common/js/public"
;
import
{
getRequest
,
postRequest
,
postJson
,
postForm
}
from
'@/api/api'
;
import
groupTransfer
from
'@/components/groupTransfer'
;
export
default
{
name
:
'memberGroupList'
,
data
()
{
...
...
@@ -181,6 +183,9 @@
loading
:
false
}
},
created
()
{
this
.
loading
=
true
;
},
filters
:
{
formatTimeYMD
(
data
)
{
return
data
&&
data
!=
'- -'
?
data
.
split
(
' '
)[
0
]
:
'--'
;
...
...
@@ -211,6 +216,12 @@
}
},
methods
:
{
setRowClassName
({
row
,
rowIndex
})
{
console
.
log
(
row
,
rowIndex
);
// if (rowIndex === 1) {
// return 'row-need-loading';
// }
},
/**
*
*/
...
...
@@ -432,15 +443,17 @@
})
that
.
groupTableData
=
resData
.
result
.
result
that
.
loading
=
false
;
// showMsg.showmsg('保存成功','success')
return
;
}
that
.
loading
=
false
;
errMsg
.
errorMsg
(
resData
)
})
.
catch
(
function
(
error
)
{
// console.log(error);
that
.
loading
=
false
;
that
.
$message
.
error
({
duration
:
1000
,
message
:
error
.
message
...
...
@@ -453,11 +466,10 @@
that
.
getGroupList
()
},
components
:
{
groupTransfer
,
navCrumb
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
>
</
style
>
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