Skip to content

M
memberTag-web
Commit 6a76567c by member
Options

合并dev

parents d3504848 32e58426
Showing with 92 additions and 80 deletions
package-lock.json
......@@ -690,7 +690,7 @@
},
"async-validator": {
"version": "1.8.5",
"resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
......@@ -3650,9 +3650,9 @@
"dev": true
},
"element-ui": {
"version": "2.7.2",
"resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.7.2.tgz",
"integrity": "sha1-i8W+9cPFOiFwQiUWtDJOcAacI9E=",
"version": "2.8.2",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.8.2.tgz",
"integrity": "sha1-Iaeky5Jhaw+LddTU5jfToc2MCd4=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
......@@ -4751,9 +4751,9 @@
"dev": true
},
"fsevents": {
"version": "1.2.8",
"resolved": "http://registry.npm.taobao.org/fsevents/download/fsevents-1.2.8.tgz",
"integrity": "sha1-V+pTIPdizUaW5ejocSDszIsRys8=",
"version": "1.2.9",
"resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.9.tgz",
"integrity": "sha1-P17WZYPM1vQAtaANtvfoYTY+OI8=",
"dev": true,
"optional": true,
"requires": {
......
package.json
......@@ -11,7 +11,7 @@
"version": "conventional-changelog -p angular -i changelog.md -s -r 0 && git add changelog.md"
},
"dependencies": {
"element-ui": "^2.3.9",
"element-ui": "^2.8.2",
"file-saver": "^1.3.8",
"tinymce": "^4.8.3",
"vue": "^2.5.2",
......
src/components/tag/tag-config-options.vue
......@@ -16,6 +16,7 @@
</div>
</div>
</template>
<!-- 2.数字范围 -->
<template v-if="parent.templateCode == 'tag003'">
<div class="m-b-20" :key="'tag2' + pindex">
......@@ -64,7 +65,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
......@@ -164,7 +165,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
......@@ -426,7 +427,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']">
</el-date-picker>
......@@ -446,10 +447,8 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
>
format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -517,10 +516,9 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyyMMdd"
format="yyyy-MM-dd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
value-format="yyyyMMdd">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -707,18 +705,7 @@ export default {
tag009: {
allSelectActive: 'first',
inputSearch: '',
allSelectOptions: [
// {
// id: 1,
// check: false,
// name: '欧时力'
// },
// {
// id: 2,
// check: false,
// name: '伊芙丽'
// }
],
allSelectOptions: [],
selectedOptions: []
},
......@@ -906,6 +893,7 @@ export default {
template: data.template
};
// syo 关键点 修改实时以及key
this.tagData.tagId = data.tagId;
this.tagData.tagType = data.tagType;
this.tagData.tagName = data.tagName;
this.currentKey = data.columnKey;
......@@ -1074,10 +1062,10 @@ export default {
key: this.tagData.tagType == 1 ? this.tagData.tagId : this.currentKey,
requestProject: 'gic-member-tag-web'
};
this.axios
.post(`${this.baseUrl}${url}`, qs.stringify(para))
this.axios.post(`${this.baseUrl}${url}`, qs.stringify(para))
.then(res => {
let resData = res;
console.log(resData);
if (this.tagData.tagType != 1 && this.currentKey != 'tag') {
if (resData.data.errorCode == 0) {
data.options = resData.data.result;
......@@ -1086,8 +1074,8 @@ export default {
return;
}
} else {
if (resData.errorCode == 1) {
data.options = resData.result;
if (resData.data.errorCode == 1) {
data.options = resData.data.result;
this.templateData.push(data);
this.getExistData(this.tagData.tagId, data.options);
}
......@@ -1099,17 +1087,30 @@ export default {
});
},
isContained(a, b) {
if (!(a instanceof Array) || !(b instanceof Array)) return false;
if (!b.length) {
return false;
}
if (a.length < b.length) return false;
let aStr = a.toString();
for (let i = 0, len = b.length; i < len; i++) {
if (aStr.indexOf(b[i]) == -1) return false;
}
return true;
},
/**
* 获取当前标签已存数据
*/
getExistData(tagId, newOptions) {
let that = this;
const param = {
tagId: tagId,
requestProject: 'gic-member-tag-web'
};
findOndJson(param)
.then(res => {
console.log(res);
if (res.errorCode == 1) {
if (!res.result || res.tagParams == '[]') {
this.addTempFlag = false;
......@@ -1117,11 +1118,10 @@ export default {
}
// 查看该标签是否在暂存架中
this.addTempFlag = true;
let items = JSON.parse(res.tagParams).template;
let items = JSON.parse(res.result.tagParams).template;
if (!!newOptions) {
items.forEach(function(ele, index) {
if (ele.templateCode == 'tag013') {
console.log(11);
ele.options = newOptions;
let idOptions = newOptions.map(el => el.key);
let checkFlag = true;
......@@ -1131,7 +1131,7 @@ export default {
}
});
let checkedCount = ele.checkeditems.length;
if (this.isContained(ele.checkeditems, idOptions)) {
if (that.isContained(ele.checkeditems, idOptions)) {
ele.checkAll = true;
ele.isIndeterminate = false;
return false;
......@@ -1243,6 +1243,7 @@ export default {
case 'tag013':
value = tagValue.val[0].data.value.split(' ');
console.log(value);
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag013') {
this.templateData[i].checkeditems = value;
......@@ -1420,14 +1421,18 @@ export default {
* 重置条件添加的时候是空的
*/
resetOptions() {
// let tagValue = JSON.parse(this.templateDataList.tagValue);
switch (this.templateDataList.templateCode) {
case 'tag003':
this.templateData[0].numRange = [];
break;
case 'tag007':
this.templateData[0].addTags = [];
break;
if (this.templateData.length) {
for (let tem of this.templateData) {
console.log(tem);
switch(tem.templateCode) {
case 'tag003':
tem.numRange = [];
break;
case 'tag007':
tem.addTags = [];
break;
}
}
}
}
},
......
src/components/tagDetail/mixin/index.js
......@@ -334,6 +334,8 @@ export default {
]
};
console.log(this.templateData[0]);
let code = that.templateData[0].templateCode;
/* 多选 */
if (code === 'tag001' && !that.templateData[0].checkeditems.length) {
......@@ -2032,6 +2034,7 @@ export default {
*/
getAsyncList(url, data) {
const that = this;
console.log(this.tagData.tagType)
const para = {
key: that.tagData.tagType == 1 ? that.tagData.tagId : that.currentKey,
requestProject: 'member-tag'
......
src/view/memberGroup/edit-tag.vue
......@@ -106,19 +106,16 @@ export default {
<style lang="less" scoped>
.dialog-box {
.tag-name {
display: inline-block;
vertical-align: middle;
font-size: 16px;
font-weight: bold;
color: #303133;
display: inline-block;
margin-bottom: 5px;
.tag-flag {
margin-left: 5px;
padding: 3px 8px;
vertical-align: middle;
font-size: 12px;
margin-left: 6px;
padding: 3px 10px;
border-top-right-radius: 5px;
border-bottom-left-radius: 5px;
background-color: #1890ff;
color: #fff;
background: #1890FF;
border-radius: 0 5px 0 5px;
}
}
.icon-tag-name {
......
src/view/memberGroup/group-list.vue
......@@ -19,9 +19,9 @@
</ul>
</el-collapseTransition>
<div class="recommend-list" :class="{ 'recommend-active': active }" @click="getRecommendList">
<!-- <div class="recommend-list" :class="{ 'recommend-active': active }" @click="getRecommendList">
推荐会员分组
</div>
</div> -->
<el-dialog :title="title" :visible.sync="addGroupDialog" width="320px" top="30vh" :close-on-click-modal="false">
<div>
......@@ -223,15 +223,15 @@ export default {
handleExpend() {
this.expendTxt = this.expendTxt === '展开' ? '收起' : '展开';
},
getRecommendList() {
let editFlag = this.lists.some(el => el.edit);
if (editFlag) {
this.handleNoEditClassifyName();
}
this.active = true;
this.currentIndex = -1;
this.$emit('getRecommend');
}
// getRecommendList() {
// let editFlag = this.lists.some(el => el.edit);
// if (editFlag) {
// this.handleNoEditClassifyName();
// }
// this.active = true;
// this.currentIndex = -1;
// this.$emit('getRecommend');
// }
},
beforeMount() {
......@@ -262,6 +262,9 @@ export default {
color: #303133;
font-weight: bold;
cursor: pointer;
&:hover {
color: #1890ff;
}
.icon-right {
float: right;
}
......@@ -298,6 +301,7 @@ export default {
}
}
.active-li {
background-color: #f6f8fd;
color: #1890ff;
}
.icon-list-oper {
......
src/view/memberGroup/memberGroupList.vue
......@@ -59,7 +59,7 @@
{{ scope.row.isRealTime === 1 ? '实时' : '非实时' }}
</template>
</el-table-column>
<el-table-column label="最近更新时间" show-overflow-tooltip >
<el-table-column label="最近更新时间" show-overflow-tooltip width="230px">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
......@@ -102,13 +102,15 @@
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
</template>
</el-table-column>
<el-table-column prop="recentUpdateDate" label="到期时间" show-overflow-tooltip >
<template slot-scope="scope">
<p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
</template>
</el-table-column>
<el-table-column label="操作" width="130">
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<router-link
:to="`/memberGroupDetail?memberTagGroupId=${scope.row.memberTagGroupId}`"
......@@ -122,13 +124,9 @@
>
编辑
</router-link>
<!-- <el-button type="text" size="small" class="p-r-12" @click="toDelTag(scope.row, scope.$index)">删除</el-button>
<el-popover placement="top" width="50" trigger="hover">
刷新覆盖人数
<el-button slot="reference" type="text" size="small" @click="refreshGroup(scope.row)">刷新</el-button>
</el-popover> -->
</template>
</el-table-column>
</el-table>
</div>
<div class="block common-wrap__page text-right" v-if="groupTableData.length != 0">
......
src/view/platformTag/member-tag.vue
......@@ -58,9 +58,7 @@
<vue-gic-footer></vue-gic-footer>
</div>
<!-- <div class="deal-list-mask" v-show="groupShow"></div> -->
<div class="group-right-list" :class="{'group-transtion-list': groupShow}">
<div class="group-right-list" :class="{'group-transtion-list': groupShow}">
<div class="group-title">
<i class="iconfont icon-17" />
已经选标签：
......@@ -87,7 +85,7 @@
</div>
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">分组有效期</label>
<el-date-picker v-model="tagConfig.date" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:MM:SS" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker v-model="tagConfig.date" :picker-options="pickerOptions" type="date" placeholder="选择日期"> </el-date-picker>
</div>
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">分组描述</label>
......@@ -141,6 +139,7 @@ export default {
data() {
return {
sy: '',
margin60: false,
refershList: {},
tagConfig: {
......@@ -676,8 +675,13 @@ export default {
bottom: 0px;
box-shadow: 0 0 5px #bbb;
background-color: #fff;
<<<<<<< HEAD
z-index: 100;
transition: all 0.3s ease-in-out;
=======
z-index: 1001;
transition: all .3s ease-in;
>>>>>>> origin/dev
.group-title {
padding: 10px;
height: 50px;
......@@ -735,7 +739,7 @@ export default {
}
}
.group-transtion-list {
transition: all ease-in 0.3s;
transition: all .3s ease-in;
right: 0px;
}
.groupName-txt {
......@@ -743,11 +747,13 @@ export default {
color: #909399;
top: 2px;
left: -45px;
font-size: 14px;
}
.textarea-txt {
position: relative;
color: #909399;
left: -70px;
font-size: 14px;
}
}
.margin-60 {
......
src/view/platformTag/tag-type.vue
......@@ -98,7 +98,6 @@ export default {
}
}
.second-tag {
padding: 10px 0px 10px 23px;
margin: 0 1px;
font-size: 14px;
color: #303133;
......
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