Skip to content

H
haoban-3
Commit 774fc6d1 by crushh
Options

Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

parents 272432c3 4cfc46a9
Showing with 69 additions and 34 deletions
src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
......@@ -2,7 +2,7 @@
<section>
<el-form inline>
<el-form-item>
<el-input placeholder="请输入活码ID/名称、创建人" style="width: 300px" @change="searchList" v-model="inFields.hmSelect" clearable>
<el-input placeholder="请输入活码ID/名称、创建人" style="width: 260px" @change="searchList" v-model="inFields.hmSelect" clearable>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
......@@ -11,12 +11,6 @@
<el-option label="成员所属门店" :value="1"></el-option>
<el-option label="关联导购" :value="2"></el-option>
</el-select>
<!-- <el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" v-loadmore="onLoadmoreStore" @change="searchList" style="margin-left: -4px; width:196px;" clearable>
<el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId"> </el-option>
</el-select>
<el-select v-model="inFields.clerkSelect" v-if="storeSelect == 2" filterable remote placeholder="请输入成员名称/code" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;" clearable>
<el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option>
</el-select> -->
<el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;" clearable v-loadmore="onLoadmoreStore" popper-class="s-select" @clear="searchListShop">
<el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId">
<p class="sname">{{ item.storeName }}</p>
......@@ -49,7 +43,7 @@
</el-form-item>
<el-form-item class="frmbt20">
<el-button @click="batchGoupEvent" v-if="$getButtonLimit($buttonCode.batchGroup)" :limit-code="$buttonCode.batchGroup">批量分组</el-button>
<el-button class="ghost-btn " @click="$router.push('/actCodeBatch')" v-if="$getButtonLimit($buttonCode.batchActCode)" :limit-code="$buttonCode.batchActCode">批量创建活码</el-button>
<el-button type="primary" class="ghost-btn " @click="$router.push('/actCodeBatch')" v-if="$getButtonLimit($buttonCode.batchActCode)" :limit-code="$buttonCode.batchActCode">批量创建活码</el-button>
<el-button type="primary" @click="$router.push('/actCodeAdd')" v-if="$getButtonLimit($buttonCode.addActCode)" :limit-code="$buttonCode.addActCode">新增活码</el-button>
<!-- <el-button @click="batchGoupEvent">批量分组</el-button>
<el-button class="ghost-btn " @click="$router.push('/actCodeBatch')">批量创建活码</el-button>
......@@ -69,31 +63,31 @@
<p>{{ row.hmCode }}</p>
</template>
</el-table-column>
<el-table-column label="活码信息" min-width="100">
<el-table-column label="活码信息" min-width="120">
<template slot-scope="{ row }">
<p class="overflow-ellipsis" :title="row.hmName">{{ row.hmName ? row.hmName : '--' }}</p>
<p><span class="oneActCode" v-if="row.hmType == 1">单人活码</span><span class="moreActCOde" v-else>多人活码</span></p>
</template>
</el-table-column>
<el-table-column label="活码状态" min-width="130">
<el-table-column label="活码状态" min-width="90">
<template slot-scope="{ row }">
<p><span class="dot normal" v-if="row.statusFlag == 1">正常</span><span class="dot voided" v-if="row.statusFlag == 2">作废</span><span class="dot needSure" v-if="row.statusFlag == 3">待生效</span></p>
<p class="toTopTip" v-if="row.overFlag == 1">(今日已达上限)</p>
</template>
</el-table-column>
<el-table-column label="添加好友人数" prop="addNumT" sortable="custom" min-width="150">
<el-table-column label="添加好友人数" prop="addNumT" sortable="custom" min-width="120">
<template slot-scope="{ row }">
<p>{{ row.addNumT ? row.addNumT : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="今日新增人数" prop="addNum" sortable="custom" min-width="150">
<el-table-column label="今日新增人数" prop="addNum" sortable="custom" min-width="120">
<template slot-scope="{ row }">
<p>{{ row.addNum ? row.addNum : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="关联导购" min-width="130" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.clerkList[0] ? row.clerkList[0].clerkName : '--' }}</p>
<p class="overflow-ellipsis">{{ row.clerkList[0] ? row.clerkList[0].clerkName : '--' }}</p>
<p class="ft-12 phone overflow-ellipsis">{{ row.clerkList[0] ? `code：${row.clerkList[0].clerkCode}` : '--' }}</p>
<p v-if="row.clerkList && row.clerkList.length > 1">
<el-popover width="200" trigger="click">
......@@ -108,10 +102,10 @@
</p>
</template>
</el-table-column>
<el-table-column label="成员所属门店" min-width="120" show-overflow-tooltip>
<el-table-column label="成员所属门店" min-width="150" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.storeList[0] ? row.storeList[0].storeName : '--' }}</p>
<p class="ft-12 phone">{{ row.storeList[0] ? `code：${row.storeList[0].storeCode}` : '--' }}</p>
<p class="overflow-ellipsis">{{ row.storeList[0] ? row.storeList[0].storeName : '--' }}</p>
<p class="ft-12 phone overflow-ellipsis">{{ row.storeList[0] ? `code：${row.storeList[0].storeCode}` : '--' }}</p>
<p v-if="row.storeList && row.storeList.length > 1">
<el-popover width="200" trigger="click">
<ul class="userMember-ul">
......@@ -125,7 +119,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="所属分组" min-width="100" show-overflow-tooltip>
<el-table-column label="所属分组" min-width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<p class="overflow-ellipsis">{{ row.hmGroupName ? row.hmGroupName : '--' }}</p>
</template>
......@@ -153,7 +147,7 @@
</div>
<el-dialog title="选择分组" :visible.sync="dialogGroupFormVisible" width="25%">
<el-form :model="formGroup">
<el-form-item label="活动区域" :rules="[{ required: true, message: '请选择分组', trigger: 'blur' }]">
<el-form-item label="活码分组" :rules="[{ required: true, message: '请选择分组', trigger: 'blur' }]">
<el-select v-model="formGroup.groupId" placeholder="选择分组" v-loadmore="onLoadmore" remote filterable :remote-method="remoteMethod" @visible-change="visibleChange" clearable>
<el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option>
</el-select>
......@@ -307,8 +301,8 @@ export default {
limitCode: this.$buttonCode.delActCode
},
handler: row => {
this.$confirm('确认要作废该活码？此操作将永久废弃该活码，请确保不影响其他投放使用!', '作废提示', {
confirmButtonText: '删除',
this.$confirm('此操作将永久废弃该活码，请确保不影响其他投放使用!', '确认要作废该活码？', {
confirmButtonText: '作废',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
......@@ -343,7 +337,7 @@ export default {
},
groupList: [],
pageParamGroup: {
search: '',
groupName: '',
pageNum: 1,
pageSize: 20,
total: 1
......@@ -473,7 +467,7 @@ export default {
// 远程搜索
remoteMethod(query) {
if (query !== '') {
this.pageParamGroup.search = query;
this.pageParamGroup.groupName = query;
this.pageParamGroup.pageNum = 1;
this.groupList = [];
this.searchGroup();
......@@ -500,6 +494,7 @@ export default {
return this.$message({ message: '请先选择活码！', type: 'warning' });
} else {
this.dialogGroupFormVisible = true;
this.searchGroup();
}
},
async batchOK() {
......@@ -596,16 +591,30 @@ export default {
};
</script>
<style>
.el-button--text + .el-dropdown {
margin-left: 15px !important;
}
</style>
<style lang="less" scoped>
.el-form--inline .el-form-item {
margin-right: 5px !important;
}
.damolish .el-form-item {
margin-bottom: 16px !important;
.frmbt20 {
margin-bottom: 20px !important;
margin-right: 0 !important;
float: right;
padding-right: 0 !important;
}
}
.frmbt20 {
margin-bottom: 20px !important;
margin-right: 0 !important;
float: right;
padding-right: 0 !important;
}
.ml10 {
margin-left: 10px;
}
.w160 {
width: 160px;
}
......@@ -627,12 +636,16 @@ export default {
content: '' !important;
}
.oneActCode {
height: 18px;
padding: 2px 4px;
background: #cff2f5;
border-radius: 2px;
color: #0faab6;
font-size: 12px;
}
.moreActCOde {
height: 18px;
padding: 2px 4px;
background: #dee3fc;
border-radius: 2px;
color: #2f54eb;
......@@ -690,6 +703,7 @@ export default {
}
}
.s-select {
width: 196px;
.el-select-dropdown__item {
height: 57px;
padding-top: 9px;
......
src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue
......@@ -15,7 +15,7 @@
<el-popover placement="bottom" trigger="click" v-if="isShowGroupListItemMore(listItem)">
<p class="more" @click="editGroupListItem(listItem)">编辑</p>
<p class="more" @click="delGroupListItem(listItem)" v-if="!listItem.referNum">删除</p>
<i slot="reference" class="iconfont-hb3 icongengduo icon iconhover" v-if="listItem.groupName != '全部分组' && listItem.groupName != '默认分组'"></i>
<i slot="reference" class="iconfont-hb3 icongengduo3 icon iconhover" v-if="listItem.groupName != '全部分组' && listItem.groupName != '默认分组'"></i>
</el-popover>
</li>
<li>
......@@ -34,8 +34,9 @@
<el-form :model="groupListForm" :rules="groupListFormRules" ref="groupListForm">
<el-form-item label="分组名称" prop="groupName">
<el-input placeholder="请输入分组名称" v-model="groupListForm.groupName" :maxlength="10" show-word-limit clearable></el-input>
<p class="addGroupTip" v-show="!isEditGroup">分组名称不可重复，建议"创建人姓名-分组名称"</p>
</el-form-item>
<p class="addGroupTip" v-show="!isEditGroup">分组名称不可重复，建议"创建人姓名-分组名称"</p>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addOrEditGroupDialog = false">取 消</el-button>
......@@ -290,6 +291,14 @@ export default {
justify-content: space-between;
align-items: center;
padding: 0 5px 0 10px;
.iconhover,
.el-popover__reference {
display: inline-block;
width: 20px;
height: 20px;
line-height: 20px;
text-align: center;
}
&:hover {
color: #303133;
background: #f2f3f5;
......@@ -297,9 +306,17 @@ export default {
&.active-li {
color: #2f54eb;
background: #ebeffe;
.iconhover:hover,
.iconhover:active {
.iconhover {
background: #d8defc;
border-radius: 2px;
}
}
.iconhover:hover {
background: #d8defc;
border-radius: 2px;
&:active {
background: #d8defc;
border-radius: 2px;
}
}
}
......
src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue
......@@ -159,4 +159,8 @@ export default {
.w340 {
width: 340px;
}
.tabs {
font-size: 12px;
color: #909399;
}
</style>
src/views/salesleads/components/welcomesItem.vue
......@@ -26,7 +26,7 @@
<div class="welcomeTable">
<div class="wtabTop">
<el-input class="w260" placeholder="请输入标题" v-model="welcomePage.title" @keyup.native="toInput" clearable @clear="onSearch"></el-input>
<el-button plain class="blueBtn" @click="changeRoute">新建欢迎语</el-button>
<el-button type="primary" plain class="blueBtn" @click="changeRoute">新建欢迎语</el-button>
</div>
<el-table :data="welcomeTableData" max-height="300px" @row-click="getCurrentRow">
<el-table-column width="55">
......@@ -98,7 +98,7 @@ export default {
},
welcomeTableData: [],
welcomeContent: '',
welcomeContent: '你好，<微信名称>',
welcomeMediaList: [],
// 欢迎语参数
welcomePage: {
......
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