Commit d803a30b by chenxin

feat:3.0权限 部分列表展示创建人 根据isShowSelf列表中对应显示/隐藏'仅看本人'btn,单行canEdit === false时为不可操作,改行隐藏相关操作按钮

parent d085e5f2
......@@ -62,6 +62,7 @@ export default {
created() {
this.saveUserId();
this.changeTab();
this.$store.dispatch('getIsShowSelfData'); // 展示是否显示 '仅看本人' btn
}
};
</script>
......
......@@ -111,6 +111,9 @@ a:hover {
.pr30{
padding-right: 30px!important;
}
.ml0{
margin-left: 0px!important;
}
.ml25{
margin-left: 25px!important;
}
......
......@@ -2,14 +2,15 @@
<label :name="imgData.imageId" class="dm-img-item">
<div class="dm-img-item_top" @mouseover="optShow = true" @mouseout="optShow = false">
<img :src="imgData.qcloudImageUrl" alt="" srcset="" />
<div class="dm-img-item_opt" v-show="optShow">
<div class="dm-img-item_opt" v-show="optShow" v-if="imgData.canEdit !== false">
<i class="fz14 el-icon-edit cursor" @click.stop.prevent="edit"></i>
<i class="iconfont icon-fenzu cursor" @click.stop.prevent="move"></i>
<i class="fz14 el-icon-delete cursor" @click.stop.prevent="del"></i>
</div>
</div>
<div class="dm-img-item_center">
<el-checkbox :label="imgData.imageId">{{ imgData.imageTitle }}</el-checkbox>
<!-- 是本人 -->
<el-checkbox :disabled="imgData.canEdit === false" :label="imgData.imageId">{{ imgData.canEdit }}{{ imgData.imageTitle }}</el-checkbox>
</div>
</label>
</template>
......
......@@ -63,7 +63,8 @@ export default {
listParams: {
currentPage: 1,
pageSize: 20,
wechatImageGroupId: ''
wechatImageGroupId: '',
showSlefFlag: ''
},
total: 0,
checkedList: [],
......@@ -118,7 +119,10 @@ export default {
const resList = res.result.page.result;
this.$nextTick(_ => {
resList.map(v => {
this.checkedOptions.push(v.imageId);
// v.canEdit = Math.random() > 0.5;
if (v.canEdit !== false) {
this.checkedOptions.push(v.imageId);
}
this.imgList.push(v);
});
});
......@@ -175,9 +179,7 @@ export default {
.then(() => {
this.deleteImageService(val);
})
.catch(() => {
this.$tips({ type: 'info', message: '已取消删除' });
});
.catch(() => {});
},
async deleteImageService(val) {
try {
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-09 10:13:16
* @LastEditors: Please set LastEditors
-->
<template>
<section :class="{ 'dm-wrap': auto }">
<div class="dm-imgtext_head" :class="pbSize">
<div>
图文消息(共{{ total }}条) <el-input v-model="listParams.searchName" clearable class="w200 ml10" placeholder="请输入标题/作者" @change="loadImgTextList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
图文消息(共{{ total }}条)
<el-input v-model="listParams.searchName" clearable class="w200 ml10" placeholder="请输入标题/作者" @change="loadImgTextList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="loadImgTextList" />
</div>
<div>
<el-button type="primary" @click="add">新建图文</el-button>
......@@ -45,11 +40,12 @@
</p>
</template>
</el-table-column>
<el-table-column label="创建人" prop="creatorName" align="left"></el-table-column>
<el-table-column label="操作" align="left" v-if="auto">
<template slot-scope="scope">
<el-button type="text" @click="editData(scope.row)">编辑</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false" @click="editData(scope.row)">编辑</el-button>
<dm-delete @confirm="delData(scope.row)" tips="确认删除该图文?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
<el-button type="text" @click="$router.push('/wechat/record/add/' + scope.row.imageTextId)">使用</el-button>
</template>
......@@ -91,7 +87,8 @@ export default {
listParams: {
currentPage: 1,
pageSize: 20,
searchName: ''
searchName: '',
showSlefFlag: ''
},
total: 0,
loading: false,
......
......@@ -18,3 +18,6 @@ export const getUserLogin = params => requests(PREFIX + 'get-login-user-info', p
// 退出登录
export const logout = params => requests(PREFIX + 'do-logout?requestProject=marketing', params);
// 获取显示本人btn
export const getIsShowSelf = params => requests(MARKET_PREFIX + 'is-show-self?requestProject=marketing', params);
import { getIsShowSelf } from '@/service/api/commonApi.js';
// initial state
const state = {
all: 0,
......@@ -7,7 +9,8 @@ const state = {
storeObj: {},
asideShow: false,
breadcrumb: [],
layoutTips: ''
layoutTips: '',
isShowSelf: false // 展示是否显示 '仅看本人' btn 在app.vue调用 每次刷新都会获取
};
// getters
......@@ -39,6 +42,10 @@ const actions = {
removecartData({ commit }, item) {
commit('mutations_removeCartData', item);
},
async getIsShowSelfData(state) {
let res = await getIsShowSelf();
this.commit('mutations_isShowSelf', res.result);
}
};
......@@ -67,6 +74,9 @@ const mutations = {
},
mutations_layoutTips(state, val) {
state.layoutTips = val;
},
mutations_isShowSelf(state, val) {
state.isShowSelf = Boolean(val);
}
};
......
......@@ -3,6 +3,7 @@
<div class="pb22 clearfix">
<el-date-picker class="w250" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input v-model="listParams.searchParam" class="w300" placeholder="订单号/门店名称/导购姓名" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" icon="iconfont icon-icon_yunxiazai fz14" @click="exportExcel"> 下载Excel</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
......@@ -48,6 +49,7 @@
{{ (scope.row.differenceValue >= 0 ? ' +' : '-') + '¥' + Math.abs(parseInt(scope.row.differenceValue)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="100" align="left" prop="creatorName" label="创建人"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="errorMsg" label="错误原因"></el-table-column>
<el-table-column width="100" align="left" prop="orderRemarks" label="备注内容">
<template slot-scope="scope">
......@@ -80,7 +82,8 @@ export default {
endTime: '',
searchParam: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
showSlefFlag: ''
},
total: 0,
loading: false,
......
......@@ -4,6 +4,7 @@
<div class="pb22">
<el-input v-model="listParams.cardName" class="w250" placeholder="请输入卡券名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.nickName" class="w250" placeholder="请输入用户昵称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" icon="iconfont icon-icon_yunxiazai fz14" @click="exportTemplateReceivedExcel"> 导出记录</el-button>
</div>
<div class="filter--box">
......@@ -47,6 +48,7 @@
</div>
</template>
</el-table-column>
<el-table-column min-width="100" align="left" prop="creatorName" label="创建人"></el-table-column>
</el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......@@ -80,7 +82,8 @@ export default {
status: '',
attentionBeginTime: '',
attentionEndTime: '',
cardType: ''
cardType: '',
showSlefFlag: ''
},
total: 0,
projectName: 'marketing', // 当前项目名
......
......@@ -3,6 +3,7 @@
<!-- 条件筛选区 -->
<div class="pb22">
<el-input v-model="listParams.search" class="w300" placeholder="请输入卡券名称/卡券代码/会员信息" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" icon="iconfont icon-icon_yunxiazai fz14" @click="exportReceivedRecordExcel"> 导出订单</el-button>
</div>
<div class="filter--box">
......@@ -72,11 +73,14 @@
{{ scope.row.status === 5 ? (scope.row.checkSource === 0 ? '订单核销' : '手动核销') : '--' }}
</template>
</el-table-column>
<el-table-column min-width="100" align="left" prop="creatorName" label="创建人"></el-table-column>
<el-table-column label="操作" align="left" width="120px" fixed="right">
<template slot-scope="scope">
<!-- 卡券类型为 e袋洗 时 列表操作按钮 无手动核销按钮 -->
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000 && scope.row.gicCouponType !== 1" @click="orderData(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000" @click="delData(scope.row)">销毁</el-button>
<!-- 卡券类型为 e袋洗时 列表操作按钮 无手动核销按钮 -->
<template v-if="scope.row.canEdit !== false">
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000 && scope.row.gicCouponType !== 1" @click="orderData(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.status === 4 && Date.now() < scope.row.limitTime + 24 * 60 * 60 * 1000" @click="delData(scope.row)">销毁</el-button>
</template>
</template>
</el-table-column>
</el-table>
......@@ -117,7 +121,8 @@ export default {
pageSize: 20,
writeOffBeginTime: '',
writeOffEndTime: '',
sortBy: ''
sortBy: '',
showSlefFlag: ''
},
total: 0,
cardOrderShow: false,
......
......@@ -2,6 +2,7 @@
<section class="card-record-send">
<div class="pb22">
<el-input class="w300" v-model="listParams.search" placeholder="输入卡券名称/备注名/活动名" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
</div>
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="putonTime" v-loading="loading">
<el-table-column width="120" align="left" prop="putonTime" label="投放时间" fixed="left">
......@@ -31,10 +32,10 @@
<el-table-column label="操作" align="left" width="150px" fixed="right">
<template slot-scope="scope">
<el-button type="text" v-if="scope.row.putonStatus === 2 || scope.row.putonStatus === 3" @click="$router.push('/card/groupinfo/' + scope.row.putonId)">详情</el-button>
<el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3" @click="$router.push('/card/groupsend/' + scope.row.putonId)">编辑</el-button>
<el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3 && scope.row.canEdit !== false" @click="$router.push('/card/groupsend/' + scope.row.putonId)">编辑</el-button>
<el-button type="text" v-if="scope.row.putonTime > nowDate" @click="$router.push('/card/record/sendInfo/' + scope.row.putonId)">记录</el-button>
<dm-delete v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该投放记录?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -84,7 +85,8 @@ export default {
return ((row.usageQuantity * 100) / (row.getedQuantity === 0 ? 1 : row.getedQuantity)).toFixed(2) + '%';
}
},
{ label: '销售额', prop: 'saleAmount', width: '100', align: 'left' }
{ label: '销售额', prop: 'saleAmount', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
listParams: {
beginTime: '',
......@@ -93,7 +95,8 @@ export default {
recordType: 0,
search: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
showSlefFlag: ''
},
total: 0
};
......
......@@ -3,6 +3,7 @@
<div class="pb22">
<store-group class="w200 pr4" :model="currentData" @commit-store="storeChange"></store-group>
<el-input class="w300" v-model="listParams.searchParam" clearable placeholder="输入门店名称/代码/地区名" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" @sort-change="sortList">
<el-table-column min-width="120" align="left" prop="shelfName" label="门店名称">
......@@ -21,6 +22,7 @@
</template>
</el-table-column>
<el-table-column width="120" align="left" prop="saleAmount" label="销售额" sortable="custom"></el-table-column>
<el-table-column width="100" align="left" prop="creatorName" label="创建人"></el-table-column>
<el-table-column label="操作" align="left" width="160px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/card/shelf/' + scope.row.shelfId)">卡券管理</el-button>
......@@ -47,7 +49,8 @@ export default {
searchParam: '',
storeGroupId: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
showSlefFlag: ''
},
total: 0,
currentData: { label: '', id: '' }
......
......@@ -13,8 +13,8 @@
<el-select class="dm-select" clearable v-model="listParams.onlineStatus" placeholder="选择上线状态" @change="search">
<el-option v-for="(v, i) in onlineOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchName" class="w200" placeholder="输入计划名称" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="search" />
<el-button class="fr" type="primary" @click="$router.push('/ecm/add')">新建计划</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" element-loading-text="拼命加载中">
......@@ -27,11 +27,11 @@
<el-table-column label="操作" align="left" width="220" fixed="right">
<template slot-scope="scope">
<dm-delete v-if="scope.row.onlineStatus === 1" @confirm="offlineEcmPlan(scope.row)" tips="是否下线该计划?">
<el-button type="text">下线</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">下线</el-button>
</dm-delete>
<el-button type="text" @click="editData(scope.row)">编辑</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false" @click="editData(scope.row)">编辑</el-button>
<dm-delete v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该计划?">
<el-button type="text">删除</el-button>
<el-button v-if="scope.row.canEdit !== false" type="text">删除</el-button>
</dm-delete>
<el-button type="text" @click="toRecord(scope.row)">记录</el-button>
</template>
......@@ -59,7 +59,8 @@ export default {
onlineStatus: '',
searchName: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
showSlefFlag: ''
},
total: 0,
loading: false,
......@@ -97,7 +98,8 @@ export default {
}
return result;
}
}
},
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: []
};
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-19 17:17:09
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -12,6 +5,7 @@
<el-option v-for="(v, i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" @click="$router.push('/game/dzp/add')">新建游戏</el-button>
</div>
......@@ -26,10 +20,10 @@
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 1)">链接</el-button>
<el-button type="text" @click="$router.push('/game/dzp/record/' + scope.row.gameId)">中奖记录</el-button>
<el-button type="text" @click="$router.push('/game/dzp/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="$router.push('/game/dzp/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3' && scope.row.canEdit !== false">编辑</el-button>
<el-button type="text" @click="$router.push('/game/dzp/detail/' + scope.row.gameId)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -55,7 +49,8 @@ export default {
gameType: 1,
searchParam: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
showSlefFlag: ''
},
total: 0,
loading: false,
......@@ -120,7 +115,8 @@ export default {
}
},
{ label: '参与人数', prop: 'userCount', width: '100', align: 'left' },
{ label: '参与次数', prop: 'totalCount', width: '100', align: 'left' }
{ label: '参与次数', prop: 'totalCount', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: []
};
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-19 17:11:54
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -12,6 +5,7 @@
<el-option v-for="(v, i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" @click="$router.push('/game/ggk/add')">新建游戏</el-button>
</div>
......@@ -26,10 +20,10 @@
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 2)">链接</el-button>
<el-button type="text" @click="$router.push('/game/ggk/record/' + scope.row.gameId)">中奖记录</el-button>
<el-button type="text" @click="$router.push('/game/ggk/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="$router.push('/game/ggk/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3' && scope.row.canEdit !== false">编辑</el-button>
<el-button type="text" @click="$router.push('/game/ggk/detail/' + scope.row.gameId)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -55,7 +49,8 @@ export default {
searchParam: '',
currentPage: 1,
pageSize: 20,
searchType: 1
searchType: 1,
showSlefFlag: ''
},
total: 0,
loading: false,
......@@ -120,7 +115,8 @@ export default {
}
},
{ label: '参与人数', prop: 'userCount', width: '100', align: 'left' },
{ label: '参与次数', prop: 'totalCount', width: '100', align: 'left' }
{ label: '参与次数', prop: 'totalCount', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: []
};
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-19 17:12:18
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -12,6 +5,7 @@
<el-option v-for="(v, i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<!-- <el-button class="fr" icon="iconfont icon-icon_yunxiazai fz14" @click="downLoadQr"> 下载二维码 </el-button> -->
<el-button class="fr" type="primary" @click="$router.push('/game/klfl/add')">新建游戏</el-button>
</div>
......@@ -28,10 +22,10 @@
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 5)">链接</el-button>
<el-button type="text" v-if="scope.row.sendStatus !== 0" @click="$router.push('/game/klfl/record/' + scope.row.gameActivityId)">中奖记录</el-button>
<el-button type="text" v-if="scope.row.activityStatus === 0 || scope.row.activityStatus === 1" @click="$router.push('/game/klfl/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-if="(scope.row.activityStatus === 0 || scope.row.activityStatus === 1) && scope.row.canEdit !== false" @click="$router.push('/game/klfl/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-else @click="$router.push('/game/klfl/info/' + scope.row.gameActivityId)">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -57,7 +51,8 @@ export default {
searchParam: '',
currentPage: 1,
pageSize: 20,
searchType: 1
searchType: 1,
showSlefFlag: ''
},
total: 0,
tableHeader: [
......@@ -104,7 +99,8 @@ export default {
}
},
{ label: '参与人数', prop: 'cyrs', width: '100', align: 'left' },
{ label: '参与次数', prop: 'cyrc', width: '100', align: 'left' }
{ label: '参与次数', prop: 'cyrc', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: []
};
......
......@@ -5,6 +5,7 @@
<el-option v-for="(v, i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" @click="configShow = true">拼图配置</el-button>
<el-button class="fr mr10" type="primary" @click="$router.push('/game/ptyx/add')">新建游戏</el-button>
</div>
......@@ -19,10 +20,10 @@
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 3)">链接</el-button>
<el-button type="text" v-if="scope.row.activityStatus !== 0" @click="$router.push('/game/ptyx/record/' + scope.row.gameActivityId)">记录</el-button>
<el-button type="text" v-if="scope.row.activityStatus === 0 || scope.row.activityStatus === 1" @click="$router.push('/game/ptyx/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-if="(scope.row.activityStatus === 0 || scope.row.activityStatus === 1) && scope.row.canEdit !== false" @click="$router.push('/game/ptyx/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-else @click="$router.push('/game/ptyx/query/' + scope.row.gameActivityId)">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -49,7 +50,7 @@ export default {
loading: false,
total: 0,
gameStatusOptions: [{ value: -1, label: '所有状态' }, { value: 1, label: '待开始' }, { value: 2, label: '进行中' }, { value: 3, label: '已结束' }],
listParams: { gameStatus: -1, searchParam: '', currentPage: 1, pageSize: 20 },
listParams: { gameStatus: -1, searchParam: '', currentPage: 1, pageSize: 20, showSlefFlag: '' },
tableHeader: [
{ label: '游戏名称', prop: 'gameName', align: 'left', fixed: 'left' },
{
......@@ -95,7 +96,8 @@ export default {
},
{ label: '参与人数', prop: 'cyrs', width: '100', align: 'left' },
{ label: '参与次数', prop: 'cyrc', width: '100', align: 'left' },
{ label: '新增会员', prop: 'gzrs', width: '100', align: 'left' }
{ label: '新增会员', prop: 'gzrs', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: [],
configShow: false
......
......@@ -5,6 +5,7 @@
<el-option v-for="(v, i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-button class="fr" type="primary" @click="$router.push('/game/znm/add')">新建游戏</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
......@@ -18,10 +19,10 @@
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 4)">链接</el-button>
<el-button type="text" v-if="scope.row.activityStatus !== 0" @click="$router.push('/game/znm/record/' + scope.row.gameActivityId)">记录</el-button>
<el-button type="text" v-if="scope.row.activityStatus === 0 || scope.row.activityStatus === 1" @click="$router.push('/game/znm/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-if="(scope.row.activityStatus === 0 || scope.row.activityStatus === 1) && scope.row.canEdit !== false" @click="$router.push('/game/znm/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-else @click="$router.push('/game/znm/info/' + scope.row.gameActivityId)">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -42,7 +43,7 @@ export default {
return {
loading: false,
gameStatusOptions: [{ value: -1, label: '所有状态' }, { value: 1, label: '待开始' }, { value: 2, label: '进行中' }, { value: 3, label: '已结束' }],
listParams: { gameStatus: -1, searchParam: '', currentPage: 1, pageSize: 20 },
listParams: { gameStatus: -1, searchParam: '', currentPage: 1, pageSize: 20, isShowSelf: '' },
total: 0,
tableHeader: [
{ label: '游戏名称', prop: 'gameName', minWidth: '150', align: 'left', fixed: 'left', tooltip: true },
......@@ -88,7 +89,8 @@ export default {
}
},
{ label: '参与人数', prop: 'cyrs', width: '100', align: 'left' },
{ label: '参与次数', prop: 'cyrc', width: '100', align: 'left' }
{ label: '参与次数', prop: 'cyrc', width: '100', align: 'left' },
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
tableList: []
};
......
......@@ -8,6 +8,7 @@
<el-select class="dm-select" v-model="listParams.sceneSettingId" placeholder="选择营销场景" @change="refresh">
<el-option v-for="item in sceneSettingIdOptions" :key="item.sceneSettingId" :label="item.sceneName" :value="item.sceneSettingId"></el-option>
</el-select>
<el-checkbox class="vertical-middle" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="refresh" />
<el-input v-model="listParams.search" class="w200" placeholder="输入模板名称/ID/内容" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/message/record/add')">新建群发</el-button>
</div>
......@@ -31,7 +32,7 @@
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/message/record/detail/' + scope.row.smsId)">详情</el-button>
<dm-delete v-if="scope.row.sendStatus == 4 || scope.row.sendStatus == 0" @confirm="invalidData(scope.row)" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">禁用</el-button>
</dm-delete>
</template>
</el-table-column>
......@@ -107,7 +108,8 @@ export default {
},
{ label: '计划人数', prop: 'sendCount', width: '100', align: 'left' },
{ label: '送达人数', prop: 'sendSuccess', width: '100', align: 'left' },
{ label: '计费条数', prop: 'countNum', width: '100', align: 'left' }
{ label: '计费条数', prop: 'countNum', width: '100', align: 'left' },
{ label: '创建人', prop: 'creatorName', minWidth: '100', align: 'left' }
],
listParams: {
sendStatus: '',
......@@ -116,7 +118,8 @@ export default {
sendEndTime: '',
search: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
isShowSelf: ''
},
dateTime: ['', ''],
total: 0
......
/* * @Author: zhangmeng * @Date: 2018-08-14 15:45:36 * @Last Modified by: zhangmeng * @Last Modified time: 2019-01-08 14:22:58 */
<template>
<section class="dm-wrap">
<!-- <el-button type="danger" plain disabled>删除</el-button> -->
......@@ -13,6 +12,7 @@
<el-option v-for="item in sceneSettingIdOptions" :key="item.sceneSettingId" :label="item.sceneName" :value="item.sceneSettingId"></el-option>
</el-select>
<el-checkbox class="vertical-middle" v-model="listParams.hideInvalid" :true-label="1" :false-label="0" label="隐藏已失效" border @change="search"></el-checkbox>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf" v-model="listParams.showSlefFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="search" />
<el-input v-model="listParams.clerkName" clearable class="vertical-middle w200" placeholder="请输入发送人名称" @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/wechat/record/add')">新建群发</el-button>
</div>
......@@ -39,12 +39,12 @@
<template slot-scope="scope">
<el-button type="text" v-if="scope.row.contentType === 0 && scope.row.sendStatus === 1 && scope.row.couponType === 1" @click="queryData(scope.row)">数据</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该发送记录?">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">删除</el-button>
</dm-delete>
<dm-delete @confirm="invalidData(scope.row)" v-if="scope.row.contentType === 0 && scope.row.sendType !== 2 && scope.row.sendStatus == 1" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
<el-button type="text" v-if="scope.row.canEdit !== false">禁用</el-button>
</dm-delete>
<el-button type="text" v-if="scope.row.sendStatus === 0" @click="$router.push('/wechat/record/edit/' + scope.row.wechatTeletextId)">编辑</el-button>
<el-button type="text" v-if="scope.row.sendStatus === 0 && scope.row.canEdit !== false" @click="$router.push('/wechat/record/edit/' + scope.row.wechatTeletextId)">编辑</el-button>
<el-button type="text" v-if="scope.row.sendStatus !== 0" @click="$router.push('/wechat/record/info/' + scope.row.wechatTeletextId)">详情</el-button>
</template>
</el-table-column>
......@@ -155,7 +155,8 @@ export default {
renderHeader: (h, { colunm, $index }) => {
return this.renderHeader('收藏人数');
}
}
},
{ label: '创建人', minWidth: '100', prop: 'creatorName', align: 'left' }
],
listParams: {
contentType: '', //否 number 图文类型(0:图文消息,1:文本消息, 2: 图片)
......@@ -164,7 +165,8 @@ export default {
hideInvalid: 0, //否 Number 隐藏失效: 1 (不隐藏: 0)
clerkName: '', //否 String 输入发送人搜索
currentPage: 1, //是 Number 当前页面
pageSize: 20 //是 Number 每页显示条数
pageSize: 20, //是 Number 每页显示条数
showSlefFlag: '' // 仅看本人
},
total: 0,
dmDialogShow: false,
......
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