Commit 14eb946d by xiaohai

.

parent 1bcaaaa0
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "@gic-test/vue-gic-member-group", "name": "@gic-test/vue-gic-member-group",
"description": "vue-gic-member-group Plugin", "description": "vue-gic-member-group Plugin",
"version": "1.0.16", "version": "1.0.20",
"license": "MIT", "license": "MIT",
"private": false, "private": false,
"author": "fairyly", "author": "fairyly",
......
...@@ -58,7 +58,12 @@ ...@@ -58,7 +58,12 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <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 + '号' : '每月一次')}} --> <!-- {{ scope.row.updateType == 1 ? '每天一次' : scope.row.updateType == 2 ? (scope.row.updateDay ? '每周'+ weekArr[scope.row.updateDay - 1] : '每周一次') : (scope.row.updateDay ? '每月' + scope.row.updateDay + '号' : '每月一次')}} -->
{{scope.row.updateType, scope.row.updateDay | formatUpdateFrequency}} <template v-if="scope.row.isRealTime == 1">
{{scope.row.updateType, scope.row.updateDay | formatUpdateFrequency}}
</template>
<template v-else>
--
</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -161,7 +166,6 @@ ...@@ -161,7 +166,6 @@
return { return {
tableData: [], tableData: [],
pageSize: 20, pageSize: 20,
weekArr: ['一', '二', '三', '四', '五', '六', '日'],
currentPage: 1, currentPage: 1,
dataSearch: "", dataSearch: "",
baseUrl: "", baseUrl: "",
...@@ -220,7 +224,7 @@ ...@@ -220,7 +224,7 @@
*/ */
getGroupList() { getGroupList() {
const that = this; 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 => { .then(res => {
if (res.data.errorCode == 1) { if (res.data.errorCode == 1) {
that.tableData = that.tableData.concat(res.data.result.result); that.tableData = that.tableData.concat(res.data.result.result);
...@@ -263,6 +267,13 @@ ...@@ -263,6 +267,13 @@
}, },
selectToTransfer() { selectToTransfer() {
if (this.selectionToTransfer.length < 1) {
this.$message.success({
duration: 1000,
message: '请选择分组!'
});
return false;
}
this.selectedData = this.uniqueByGroupId(this.selectedData.concat(this.selectionToTransfer)); // 数组拼接并去重 this.selectedData = this.uniqueByGroupId(this.selectedData.concat(this.selectionToTransfer)); // 数组拼接并去重
this.getMemberCountByGroups(); this.getMemberCountByGroups();
this.$emit('handleDataTransferred', this.selectedData, this.selectionToTransfer); this.$emit('handleDataTransferred', this.selectedData, this.selectionToTransfer);
...@@ -304,6 +315,13 @@ ...@@ -304,6 +315,13 @@
}, },
selectToRemove() { selectToRemove() {
if (this.selectionToRemove.length < 1) {
this.$message.success({
duration: 1000,
message: '请选择分组!'
});
return false;
}
let seleced = this.selectedData; let seleced = this.selectedData;
let setection = this.selectionToRemove; let setection = this.selectionToRemove;
let aSet = new Set(seleced); let aSet = new Set(seleced);
...@@ -353,16 +371,17 @@ ...@@ -353,16 +371,17 @@
const that = this; const that = this;
switch(type) { switch(type) {
case 1: case 1:
return '每天一次'; return '每天一次';
break; break;
case 2: case 2:
return day ? `每周${that.weekArr[day - 1]}` : '每周一次'; let weekArr = ['一', '二', '三', '四', '五', '六', '日'];
return day ? `每周${weekArr[day - 1]}` : '每周一次';
break; break;
case 3: case 3:
return day ? `每月${that.weekArr[day - 1]}号` : '每月一次'; return day ? `每月${day}号` : '每月一次';
break; break;
default: default:
return '--'; return '--';
} }
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment