Commit 5ee18fad by YG8429

时长日志增加时长类型,页面调整样式

parent b65bad80
...@@ -124,6 +124,11 @@ ...@@ -124,6 +124,11 @@
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="当前时长" prop="currentDuration"/> <el-table-column align="center" label="当前时长" prop="currentDuration"/>
<el-table-column align="center" label="变动时长" prop="variableDuration"/> <el-table-column align="center" label="变动时长" prop="variableDuration"/>
<el-table-column align="center" label="时长类型" prop="durationType">
<template slot-scope="scope">
<dict-tag :options="dict.type.duration_type" :value="scope.row.durationType"/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>--> <!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType"> <el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -213,7 +218,7 @@ import { ...@@ -213,7 +218,7 @@ import {
export default { export default {
name: "DurationLog", name: "DurationLog",
dicts: ['operation_type'], dicts: ['operation_type','duration_type'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -289,7 +294,8 @@ export default { ...@@ -289,7 +294,8 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null,
durationType: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<el-table v-loading="loading" :data="equityFundExcessList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="equityFundExcessList" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" /> <el-table-column type="selection" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" />--> <!-- <el-table-column label="主键" align="center" prop="id" />-->
<el-table-column label="订单号" align="center" prop="outTradeNo" /> <el-table-column label="订单号" align="center" prop="outTradeNo" width="200"/>
<el-table-column label="权益金额" align="center" prop="equityFund" /> <el-table-column label="权益金额" align="center" prop="equityFund" />
<el-table-column label="上级电话" align="center" width="180" prop="phone" /> <el-table-column label="上级电话" align="center" width="180" prop="phone" />
<!-- <el-table-column label="上级账号" align="center" prop="account" />--> <!-- <el-table-column label="上级账号" align="center" prop="account" />-->
...@@ -135,16 +135,16 @@ ...@@ -135,16 +135,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="上级用户头像" prop="avatar" width="100"> <!-- <el-table-column align="center" label="上级用户头像" prop="avatar" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<image-preview :height="50" :src="scope.row.avatar" :width="50"/> <!-- <image-preview :height="50" :src="scope.row.avatar" :width="50"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="下级用户头像" prop="avatar" width="100"> <!-- <el-table-column align="center" label="下级用户头像" prop="avatar" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<image-preview :height="50" :src="scope.row.newAvatar" :width="50"/> <!-- <image-preview :height="50" :src="scope.row.newAvatar" :width="50"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="过期时间" align="center" prop="expireTime" width="180"> <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
......
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<!-- <el-table-column label="上级id" align="center" prop="uid" />--> <!-- <el-table-column label="上级id" align="center" prop="uid" />-->
<!-- <el-table-column label="下级id" align="center" prop="newUid" />--> <!-- <el-table-column label="下级id" align="center" prop="newUid" />-->
<!-- <el-table-column label="终端流水号" align="center" prop="terminalTrace" />--> <!-- <el-table-column label="终端流水号" align="center" prop="terminalTrace" />-->
<el-table-column label="订单号" align="center" prop="outTradeNo" /> <el-table-column label="订单号" align="center" prop="outTradeNo" width="200"/>
<!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />--> <!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />-->
<el-table-column label="上级电话" align="center" prop="phone" /> <el-table-column label="上级电话" align="center" prop="phone" />
<el-table-column label="上级账号" align="center" prop="account" /> <el-table-column label="上级账号" align="center" prop="account" />
...@@ -185,16 +185,16 @@ ...@@ -185,16 +185,16 @@
<el-table-column label="下级电话" align="center" prop="newPhone" /> <el-table-column label="下级电话" align="center" prop="newPhone" />
<el-table-column label="下级账号" align="center" prop="newAccount" /> <el-table-column label="下级账号" align="center" prop="newAccount" />
<el-table-column label="下级用户昵称" align="center" prop="newNickName" /> <el-table-column label="下级用户昵称" align="center" prop="newNickName" />
<el-table-column align="center" label="上级用户头像" prop="avatar" width="100"> <!-- <el-table-column align="center" label="上级用户头像" prop="avatar" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<image-preview :height="50" :src="scope.row.avatar" :width="50"/> <!-- <image-preview :height="50" :src="scope.row.avatar" :width="50"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="下级用户头像" prop="avatar" width="100"> <!-- <el-table-column align="center" label="下级用户头像" prop="avatar" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<image-preview :height="50" :src="scope.row.newAvatar" :width="50"/> <!-- <image-preview :height="50" :src="scope.row.newAvatar" :width="50"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
......
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