Skip to content

G
gxpt_web
Commit 6bc5ca29 by 吕明尚
Options

日志增加会员信息

parent f599cfa8
Showing with 209 additions and 122 deletions
src/views/system/balanceLog/index.vue
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
......@@ -9,30 +9,30 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动金额" prop="variableAmount">
<el-input
v-model="queryParams.variableAmount"
clearable
placeholder="请输入变动金额"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前余额" prop="currentBalance">
<el-input
v-model="queryParams.currentBalance"
clearable
placeholder="请输入当前余额"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时间" prop="operationTime">
<el-date-picker v-model="queryParams.operationTime"
clearable
placeholder="请选择操作时间"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="变动金额" prop="variableAmount">-->
<!-- <el-input-->
<!-- v-model="queryParams.variableAmount"-->
<!-- clearable-->
<!-- placeholder="请输入变动金额"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="当前余额" prop="currentBalance">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentBalance"-->
<!-- clearable-->
<!-- placeholder="请输入当前余额"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作时间" prop="operationTime">-->
<!-- <el-date-picker v-model="queryParams.operationTime"-->
<!-- clearable-->
<!-- placeholder="请选择操作时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
......@@ -41,6 +41,20 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="会员昵称" prop="nickName">
<el-input
v-model="queryParams.nickName"
clearable
placeholder="请输入会员昵称"
/>
</el-form-item>
<el-form-item label="会员手机号" prop="phone">
<el-input
v-model="queryParams.phone"
clearable
placeholder="请输入会员手机号"
/>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -100,37 +114,49 @@
<el-table v-loading="loading" :data="balanceLogList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column align="center" label="ID" prop="id"/>-->
<el-table-column align="center" label="用户id" prop="consumerId"/>
<!-- <el-table-column align="center" label="用户id" prop="consumerId"/>-->
<el-table-column align="center" label="会员昵称" prop="nickName"/>
<el-table-column align="center" label="会员头像" prop="avatar" width="100">
<template slot-scope="scope">
<image-preview :height="50" :src="scope.row.avatar" :width="50"/>
</template>
</el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动金额" prop="variableAmount"/>
<el-table-column align="center" label="当前余额" prop="currentBalance"/>
<el-table-column align="center" label="操作类型" prop="operationType"/>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.operation_type" :value="scope.row.operationType"/>
</template>
</el-table-column>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:balanceLog:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:balanceLog:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
<el-table-column align="center" label="备注" prop="remark"/>
<!-- <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:balanceLog:edit']"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:balanceLog:remove']"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......@@ -181,6 +207,7 @@ import {listBalanceLog, getBalanceLog, delBalanceLog, addBalanceLog, updateBalan
export default {
name: "BalanceLog",
dicts: ['operation_type'],
data() {
return {
// 遮罩层
......@@ -211,6 +238,8 @@ export default {
operationType: null,
operationTime: null,
isDelete: null,
nickName: null,
phone: null,
},
// 表单参数
form: {},
......
src/views/system/durationLog/index.vue
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
......@@ -9,30 +9,30 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动时长" prop="variableDuration">
<el-input
v-model="queryParams.variableDuration"
clearable
placeholder="请输入变动时长"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前时长" prop="currentDuration">
<el-input
v-model="queryParams.currentDuration"
clearable
placeholder="请输入当前时长"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时间" prop="operationTime">
<el-date-picker v-model="queryParams.operationTime"
clearable
placeholder="请选择操作时间"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="变动时长" prop="variableDuration">-->
<!-- <el-input-->
<!-- v-model="queryParams.variableDuration"-->
<!-- clearable-->
<!-- placeholder="请输入变动时长"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="当前时长" prop="currentDuration">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentDuration"-->
<!-- clearable-->
<!-- placeholder="请输入当前时长"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作时间" prop="operationTime">-->
<!-- <el-date-picker v-model="queryParams.operationTime"-->
<!-- clearable-->
<!-- placeholder="请选择操作时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
......@@ -41,6 +41,20 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="会员昵称" prop="nickName">
<el-input
v-model="queryParams.nickName"
clearable
placeholder="请输入会员昵称"
/>
</el-form-item>
<el-form-item label="会员手机号" prop="phone">
<el-input
v-model="queryParams.phone"
clearable
placeholder="请输入会员手机号"
/>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -100,37 +114,49 @@
<el-table v-loading="loading" :data="durationLogList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column align="center" label="ID" prop="id"/>-->
<el-table-column align="center" label="用户id" prop="consumerId"/>
<!-- <el-table-column align="center" label="用户id" prop="consumerId"/>-->
<el-table-column align="center" label="会员昵称" prop="nickName"/>
<el-table-column align="center" label="会员头像" prop="avatar" width="100">
<template slot-scope="scope">
<image-preview :height="50" :src="scope.row.avatar" :width="50"/>
</template>
</el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动时长" prop="variableDuration"/>
<el-table-column align="center" label="当前时长" prop="currentDuration"/>
<el-table-column align="center" label="操作类型" prop="operationType"/>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.operation_type" :value="scope.row.operationType"/>
</template>
</el-table-column>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:durationLog:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:durationLog:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
<el-table-column align="center" label="备注" prop="remark"/>
<!-- <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:durationLog:edit']"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:durationLog:remove']"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......@@ -187,6 +213,7 @@ import {
export default {
name: "DurationLog",
dicts: ['operation_type'],
data() {
return {
// 遮罩层
......@@ -217,6 +244,8 @@ export default {
operationType: null,
operationTime: null,
isDelete: null,
nickName: null,
phone: null,
},
// 表单参数
form: {},
......
src/views/system/memberProgressLog/index.vue
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
......@@ -9,36 +9,50 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动进度" prop="variableProgress">
<el-input
v-model="queryParams.variableProgress"
clearable
placeholder="请输入变动进度"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前进度" prop="currentProgress">
<!-- <el-form-item label="变动进度" prop="variableProgress">-->
<!-- <el-input-->
<!-- v-model="queryParams.variableProgress"-->
<!-- clearable-->
<!-- placeholder="请输入变动进度"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="当前进度" prop="currentProgress">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentProgress"-->
<!-- clearable-->
<!-- placeholder="请输入当前进度"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作时间" prop="operationTime">-->
<!-- <el-date-picker v-model="queryParams.operationTime"-->
<!-- clearable-->
<!-- placeholder="请选择操作时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入是否删除"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="会员昵称" prop="nickName">
<el-input
v-model="queryParams.currentProgress"
v-model="queryParams.nickName"
clearable
placeholder="请输入当前进度"
@keyup.enter.native="handleQuery"
placeholder="请输入会员昵称"
/>
</el-form-item>
<el-form-item label="操作时间" prop="operationTime">
<el-date-picker v-model="queryParams.operationTime"
clearable
placeholder="请选择操作时间"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-form-item label="会员手机号" prop="phone">
<el-input
v-model="queryParams.isDelete"
v-model="queryParams.phone"
clearable
placeholder="请输入是否删除"
@keyup.enter.native="handleQuery"
placeholder="请输入会员手机号"
/>
</el-form-item>
<el-form-item>
......@@ -98,9 +112,21 @@
<el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<!-- <el-table-column label="用户id" align="center" prop="consumerId" />-->
<el-table-column align="center" label="会员昵称" prop="nickName"/>
<el-table-column align="center" label="会员头像" prop="avatar" width="100">
<template slot-scope="scope">
<image-preview :height="50" :src="scope.row.avatar" :width="50"/>
</template>
</el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动进度" prop="variableProgress"/>
<el-table-column align="center" label="当前进度" prop="currentProgress"/>
<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">
<dict-tag :options="dict.type.operation_type" :value="scope.row.operationType"/>
</template>
</el-table-column>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span>
......@@ -182,6 +208,7 @@ import {
export default {
name: "MemberProgressLog",
dicts: ['operation_type'],
data() {
return {
// 遮罩层
......@@ -212,6 +239,8 @@ export default {
operationType: null,
operationTime: null,
isDelete: null,
nickName: null,
phone: null,
},
// 表单参数
form: {},
......
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