Skip to content

M
marketing
Commit bf96a75c by chenxin
Options

fix:表格换行修改

parent f77b8d3c
Showing with 178 additions and 114 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.352a10e35e5cbe33910226b1d6a5182a.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.41e915fffb6fa2b1b49e.js></script><script type=text/javascript src=/marketing/static/js/main.3e91cdf5cc6b973ba643.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.dcd7deb551fd2a7647bc79555f352b03.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.41e915fffb6fa2b1b49e.js></script><script type=text/javascript src=/marketing/static/js/main.5b92b1e48383be768662.js></script></body></html>
\ No newline at end of file
dist/static/js/main.3e91cdf5cc6b973ba643.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/main.5b92b1e48383be768662.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/components/index.scss
......@@ -188,6 +188,6 @@
}
// 表格 \n 换行
.el-table .cell {
white-space: pre-line;
}
\ No newline at end of file
// .el-table .cell {
// white-space: pre-line;
// }
\ No newline at end of file
src/components/libs/imgTextTemp/index.vue
......@@ -33,7 +33,8 @@
</el-table-column>
<el-table-column label="修改时间" prop="updateTimeStr" align="left">
<template slot-scope="scope">
{{ scope.row.updateTimeStr }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
</template>
</el-table-column>
<el-table-column label="操作" align="left" v-if="auto">
......@@ -112,10 +113,8 @@ export default {
this.textImgList = res.result.result || [];
this.total = res.result.totalCount;
this.textImgList.map(v => {
const ctime = formatDateTimeByType(v.createTime, 'yyyy-MM-dd-HH-mm', true);
const utime = formatDateTimeByType(v.updateTime, 'yyyy-MM-dd-HH-mm', true);
v.createTimeStr = ctime.y + '\n' + ctime.h;
v.updateTimeStr = utime.y + '\n' + utime.h;
v.createTimeStr = v.createTime;
// v.updateTimeStr = v.updateTime;
if (this.activeId === v.imageTextWechatId) {
this.selectedData = v;
}
......
src/utils/index.js
......@@ -36,23 +36,27 @@ export const formatDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss', newline
if (!date) {
return newline ? { y: '', h: '' } : '';
}
if (typeof date === 'number') {
if (typeof date === 'number' || typeof date === 'string') {
date = new Date(date);
}
if (typeof date === 'string') {
return newline ? { y: date, h: '' } : date;
} else {
let year = type.indexOf('yyyy') >= 0 ? fillZero(date.getFullYear()) : '';
let month = type.indexOf('MM') >= 0 ? '-' + fillZero(date.getMonth() + 1) : '';
let day = type.indexOf('dd') >= 0 ? '-' + fillZero(date.getDate()) + '' : '';
let hours = type.indexOf('HH') >= 0 ? ' ' + fillZero(date.getHours()) : '';
let min = type.indexOf('mm') >= 0 ? ':' + fillZero(date.getMinutes()) : '';
let sec = type.indexOf('ss') >= 0 ? ':' + fillZero(date.getSeconds()) : '';
// console.log(year+month+day+hours+min+sec);
if (newline) {
return { y: year + month + day, h: hours + min + sec };
try {
if (typeof date === 'string') {
return newline ? { y: date, h: '' } : date;
} else {
let year = type.indexOf('yyyy') >= 0 ? fillZero(date.getFullYear()) : '';
let month = type.indexOf('MM') >= 0 ? '-' + fillZero(date.getMonth() + 1) : '';
let day = type.indexOf('dd') >= 0 ? '-' + fillZero(date.getDate()) + '' : '';
let hours = type.indexOf('HH') >= 0 ? ' ' + fillZero(date.getHours()) : '';
let min = type.indexOf('mm') >= 0 ? ':' + fillZero(date.getMinutes()) : '';
let sec = type.indexOf('ss') >= 0 ? ':' + fillZero(date.getSeconds()) : '';
// console.log(year+month+day+hours+min+sec);
if (newline) {
return { y: year + month + day, h: hours + min + sec };
}
return year + month + day + hours + min + sec;
}
return year + month + day + hours + min + sec;
} catch (e) {
return newline ? { y: date, h: '' } : date;
}
};
......
src/views/ecm/batch-list.vue
......@@ -15,6 +15,12 @@
<span v-else>{{ scope.row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column label="批次时间" align="left" width="120" prop="execTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.execTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.execTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="220" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="toDialog(scope.row)">批次人数</el-button>
......@@ -52,18 +58,18 @@ export default {
total: 0,
loading: false,
tableHeader: [
{
label: '批次时间',
prop: 'execTime',
minWidth: '120',
align: 'left',
fixed: 'left',
formatter(row) {
const date = formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm', true);
return date.y + '\n' + date.h;
// return formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm');
}
},
// {
// label: '批次时间',
// prop: 'execTime',
// minWidth: '120',
// align: 'left',
// fixed: 'left',
// formatter(row) {
// const date = formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm', true);
// return date.y + '\n' + date.h;
// // return formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm');
// }
// },
{
label: '营销方式',
prop: 'marketingType',
......@@ -110,6 +116,7 @@ export default {
this.$store.commit('mutations_layoutTips', '');
},
methods: {
formatDateTimeByType,
search() {
this.listParams.currentPage = 1;
this.ecmBatchSendInfos();
......
src/views/ecm/current-list.vue
......@@ -19,6 +19,12 @@
<span v-else>{{ scope.row[v.prop] }}</span>
</template>
</el-table-column>
<el-table-column label="发送时间" align="left" width="120" prop="createTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
</el-table>
</div>
<div class="dm-wrap">
......@@ -95,16 +101,16 @@ export default {
tableList: [],
tableHeader: [
{ label: '回复信息', prop: 'title', minWidth: '120', align: 'left' },
{
label: '发送时间',
prop: 'createTime',
minWidth: '120',
align: 'left',
formatter(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm', true);
return date.y + '\n' + date.h;
}
},
// {
// label: '发送时间',
// prop: 'createTime',
// minWidth: '120',
// align: 'left',
// formatter(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '会员信息', prop: 'marketingType', minWidth: '120', align: 'left', component: 'member-info' },
{ label: '手机号码', prop: 'phoneNumber', minWidth: '120', align: 'left' },
{ label: '主门店', prop: 'mainStoreName', minWidth: '120', align: 'left' },
......@@ -138,6 +144,7 @@ export default {
this.$store.commit('mutations_layoutTips', '');
},
methods: {
formatDateTimeByType,
handleSelectionChange(val) {
let list = val
.map(v => v.ecmMarketingTypeRelationId)
......
src/views/game/klfl/record.vue
......@@ -22,6 +22,12 @@
</a>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="中奖时间" prop="createTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in rankHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
</el-table>
<el-pagination v-show="rankList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
......@@ -45,15 +51,15 @@ export default {
loading: false,
rankList: [],
rankHeader: [
{
label: '中奖时间',
prop: 'createTime',
align: 'left',
formatter: function(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
// {
// label: '中奖时间',
// prop: 'createTime',
// align: 'left',
// formatter: function(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '手机号码', prop: 'phoneNumber', align: 'left' },
{ label: '口令', prop: 'winCode', align: 'left' },
{
......@@ -96,6 +102,7 @@ export default {
};
},
methods: {
formatDateTimeByType,
async klflReportList() {
this.loading = true;
if (!this.date) {
......
src/views/game/ptyx/record.vue
......@@ -42,6 +42,12 @@
</a>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="玩游戏时间" prop="createTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
</el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination>
......@@ -75,15 +81,15 @@ export default {
loading1: false,
recordList: [],
recordHeader: [
{
label: '玩游戏时间',
prop: 'createTime',
align: 'left',
formatter: function(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
// {
// label: '玩游戏时间',
// prop: 'createTime',
// align: 'left',
// formatter: function(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '手机号码', prop: 'memberPhone', align: 'left' },
{ label: '消耗方式', prop: 'costType', align: 'left' },
{ label: '消耗数值', prop: 'costValue', align: 'left' },
......@@ -113,6 +119,7 @@ export default {
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '拼图游戏', path: '/game/ptyx' }, { name: '拼图游戏统计', path: '' }]);
},
methods: {
formatDateTimeByType,
async ptyxCalcTitle() {
let res = await ptyxCalcTitle({ gameActivityId: this.$route.params.id });
if (res.errorCode === 0) {
......
src/views/game/znm/record.vue
......@@ -45,6 +45,12 @@
</a>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="玩游戏时间" prop="createTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
</el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination>
......@@ -94,15 +100,15 @@ export default {
loading1: false,
recordList: [],
recordHeader: [
{
label: '玩游戏时间',
prop: 'createTime',
align: 'left',
formatter: function(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
// {
// label: '玩游戏时间',
// prop: 'createTime',
// align: 'left',
// formatter: function(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '手机号码', prop: 'memberPhone', align: 'left' },
{
label: '游戏状态',
......@@ -145,6 +151,7 @@ export default {
};
},
methods: {
formatDateTimeByType,
//排名列表
async znmReportList() {
this.loading = true;
......
src/views/message/detail.vue
......@@ -77,6 +77,12 @@
<el-button v-else type="text" @click="errorCodeShow = true">{{ scope.row.errorMsg }}</el-button>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="上报时间" prop="backTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.backTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
<template slot-scope="scope">
<el-popover class="item" trigger="hover" width="300" v-if="scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
......@@ -120,17 +126,17 @@ export default {
return row.backStatus === 0 ? '接收失败' : row.backStatus ? '接收成功' : '--';
}
},
{
label: '上报时间',
prop: 'backTime',
minWidth: '100',
tooltip: true,
align: 'left',
formatter: function(row) {
const date = formatDateTimeByType(row.backTime, 'yyyy-MM-dd-HH-mm-ss', true);
return row.backTime ? date.y + '<br/>' + date.h : '';
}
},
// {
// label: '上报时间',
// prop: 'backTime',
// minWidth: '100',
// tooltip: true,
// align: 'left',
// formatter: function(row) {
// const date = formatDateTimeByType(row.backTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return row.backTime ? date.y + '\n' + date.h : '';
// }
// },
{
label: '发送状态',
prop: 'sendStatus',
......
src/views/message/record.vue
......@@ -12,6 +12,12 @@
<el-button class="fr" type="primary" @click="$router.push('/message/record/add')">新建群发</el-button>
</div>
<el-table tooltipEffect="light" :data="messageList" style="width: 100%" row-key="sendTime" v-loading="recordLoading">
<el-table-column :min-width="100" align="left" label="发送时间" prop="sendTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed"></el-table-column>
<el-table-column label="状态" prop="sendStatus" align="left" width="140px">
<template slot-scope="scope">
......@@ -51,17 +57,17 @@ export default {
recordLoading: false,
messageList: [],
recordHeader: [
{
label: '发送时间',
prop: 'sendTime',
minWidth: '160',
align: 'left',
fixed: 'left',
formatter(row) {
const date = formatDateTimeByType(row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
// {
// label: '发送时间',
// prop: 'sendTime',
// minWidth: '160',
// align: 'left',
// fixed: 'left',
// formatter(row) {
// const date = formatDateTimeByType(row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return date.y + '\n' + date.h;
// }
// },
{
label: '模板名称',
prop: 'templateName',
......@@ -121,6 +127,7 @@ export default {
this.sceneSettingList();
},
methods: {
formatDateTimeByType,
async getTableList() {
try {
this.recordLoading = true;
......
src/views/recharge/consume.vue
......@@ -20,7 +20,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading" v-if="$route.params.type === 'marketing'">
<el-table-column align="left" width="170" prop="sendTime" label="发送时间">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.sendTime, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column align="left" width="150" prop="telephone" label="接收号码"></el-table-column>
......@@ -48,7 +49,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading" v-if="$route.params.type === 'sms'">
<el-table-column align="left" width="170" prop="createTime" label="发送时间">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column align="left" width="150" prop="receivePhone" label="接收号码"></el-table-column>
......@@ -72,7 +74,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading" v-if="$route.params.type === 'voice'">
<el-table-column align="left" prop="createTime" label="发送时间" width="170px">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column align="left" prop="receivePhone" label="接收号码"></el-table-column>
......@@ -92,7 +95,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading" v-if="$route.params.type === 'call'">
<el-table-column align="left" width="160" prop="createTime" label="呼叫时间">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
......@@ -140,7 +144,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading" v-if="$route.params.type === 'record'">
<el-table-column align="left" width="160" prop="createTime" label="呼叫时间">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="left" min-width="180" prop="storeName" label="主门店">
......
src/views/recharge/record.vue
......@@ -4,7 +4,8 @@
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column align="left" prop="timeEnd" label="充值时间">
<template slot-scope="scope">
{{ formatDateTimeByType(scope.row.timeEnd, 'yyyy-MM-dd-HH-mm-ss') }}
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.timeEnd, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.timeEnd, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column align="left" prop="transactionId" label="充值流水号"></el-table-column>
......
src/views/wechat/record.vue
......@@ -17,6 +17,12 @@
<el-button class="fr" type="primary" @click="$router.push('/wechat/record/add')">新建群发</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="sendTime" v-loading="loading">
<el-table-column :min-width="100" align="left" label="时间" prop="createTime">
<template slot-scope="scope">
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
<p style="color:#606266;">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed" :render-header="v.renderHeader"></el-table-column>
<el-table-column label="状态" align="left" prop="timesStatus" width="160px">
<template slot-scope="scope">
......@@ -65,18 +71,18 @@ export default {
loading: false,
recordList: [],
recordHeader: [
{
label: '时间',
prop: 'createTimeStr',
align: 'left',
fixed: 'left',
className: 'newline',
formatter: function(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
{ label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left' },
// {
// label: '时间',
// prop: 'createTimeStr',
// align: 'left',
// fixed: 'left',
// className: 'newline',
// formatter: function(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left', width: '120' },
{
label: '标题',
prop: 'content',
......@@ -170,6 +176,7 @@ export default {
this.sceneSettingList();
},
methods: {
formatDateTimeByType,
search() {
this.listParams.currentPage = 1;
this.sendRecordList();
......
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