|
@@ -37,12 +37,11 @@
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<el-table :data="tableData" v-loading="loading">
|
|
<el-table :data="tableData" v-loading="loading">
|
|
<el-table-column label="批次" prop="batchId" align="center" />
|
|
<el-table-column label="批次" prop="batchId" align="center" />
|
|
- <el-table-column label="购买套餐" prop="name" align="center" />
|
|
|
|
- <el-table-column label="用户姓名" prop="userName" align="center" />
|
|
|
|
- <el-table-column label="用户手机号" prop="phone" align="center" />
|
|
|
|
|
|
+ <el-table-column label="购买套餐" prop="name" align="center" :formatter="nameFormatter" />
|
|
|
|
+ <el-table-column label="用户姓名" prop="userName" align="center" :formatter="userNameFormatter" />
|
|
|
|
+ <el-table-column label="用户手机号" prop="phone" align="center" :formatter="phoneFormatter" />
|
|
<el-table-column label="服务时长" prop="serviceTime" align="center" :formatter="timeFormatter" />
|
|
<el-table-column label="服务时长" prop="serviceTime" align="center" :formatter="timeFormatter" />
|
|
<el-table-column label="Key" prop="key" align="center" />
|
|
<el-table-column label="Key" prop="key" align="center" />
|
|
- <el-table-column label="发送时间" prop="serviceTime" align="center" />
|
|
|
|
<el-table-column label="当前状态" prop="codeStatus" align="center" :formatter="statusFormatter" />
|
|
<el-table-column label="当前状态" prop="codeStatus" align="center" :formatter="statusFormatter" />
|
|
<el-table-column label="操作">
|
|
<el-table-column label="操作">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -129,7 +128,7 @@ import { page, send, importData, detail, past, batchList, batchPage } from '@/ap
|
|
import { serviceTimeMixin } from '@/mixin/index'
|
|
import { serviceTimeMixin } from '@/mixin/index'
|
|
import Upload from '@/components/Upload/index'
|
|
import Upload from '@/components/Upload/index'
|
|
export default {
|
|
export default {
|
|
- mixins: [ serviceTimeMixin ],
|
|
|
|
|
|
+ mixins: [serviceTimeMixin],
|
|
components: {
|
|
components: {
|
|
Upload
|
|
Upload
|
|
},
|
|
},
|
|
@@ -328,13 +327,22 @@ export default {
|
|
|
|
|
|
// 字典翻译
|
|
// 字典翻译
|
|
statusFormatter(row) {
|
|
statusFormatter(row) {
|
|
- return this.selectDictLabel(this.statusOptions, row.codeStatus)
|
|
|
|
|
|
+ return row.codeStatus === null ? '/' : this.selectDictLabel(this.statusOptions, row.codeStatus)
|
|
},
|
|
},
|
|
timeFormatter(row) {
|
|
timeFormatter(row) {
|
|
- return this.selectDictLabel(this.serviceTimeOptions, row.serviceTime)
|
|
|
|
|
|
+ return row.serviceTime === null ? '/' : this.selectDictLabel(this.serviceTimeOptions, row.serviceTime)
|
|
},
|
|
},
|
|
batchFormatter(row) {
|
|
batchFormatter(row) {
|
|
return this.selectDictLabel(this.batchStatusOptions, row.status)
|
|
return this.selectDictLabel(this.batchStatusOptions, row.status)
|
|
|
|
+ },
|
|
|
|
+ nameFormatter(row) {
|
|
|
|
+ return row.name === null ? '/' : row.name
|
|
|
|
+ },
|
|
|
|
+ userNameFormatter(row) {
|
|
|
|
+ return row.userName === null ? '/' : row.userName
|
|
|
|
+ },
|
|
|
|
+ phoneFormatter(row) {
|
|
|
|
+ return row.phone === null ? '/' : row.phone
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|