Skip to content

G
gxpt_web
Commit 4657fc91 by 吕明尚
Options

修改会员管理的页面

parent 84b206ff
Showing with 702 additions and 541 deletions
src/api/system/IntegralLog.js → src/api/system/integralLog.js
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询积分日志列表
export function listIntegralLog(query) {
return request({
url: '/system/IntegralLog/list',
url: '/system/integralLog/list',
method: 'get',
params: query
})
......@@ -12,7 +12,7 @@ export function listIntegralLog(query) {
// 查询积分日志详细
export function getIntegralLog(id) {
return request({
url: '/system/IntegralLog/' + id,
url: '/system/integralLog/' + id,
method: 'get'
})
}
......@@ -20,7 +20,7 @@ export function getIntegralLog(id) {
// 新增积分日志
export function addIntegralLog(data) {
return request({
url: '/system/IntegralLog',
url: '/system/integralLog',
method: 'post',
data: data
})
......@@ -29,7 +29,7 @@ export function addIntegralLog(data) {
// 修改积分日志
export function updateIntegralLog(data) {
return request({
url: '/system/IntegralLog',
url: '/system/integralLog',
method: 'put',
data: data
})
......@@ -38,7 +38,7 @@ export function updateIntegralLog(data) {
// 删除积分日志
export function delIntegralLog(id) {
return request({
url: '/system/IntegralLog/' + id,
url: '/system/integralLog/' + id,
method: 'delete'
})
}
src/views/system/activity/index.vue
......@@ -9,70 +9,77 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="活动描述" prop="activityDescription">
<el-input
v-model="queryParams.activityDescription"
clearable
placeholder="请输入活动描述"
@keyup.enter.native="handleQuery"
/>
<!-- <el-form-item label="活动描述" prop="activityDescription">-->
<!-- <el-input-->
<!-- v-model="queryParams.activityDescription"-->
<!-- clearable-->
<!-- placeholder="请输入活动描述"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="优惠比例" prop="discountRatio">-->
<!-- <el-input-->
<!-- v-model="queryParams.discountRatio"-->
<!-- clearable-->
<!-- placeholder="请输入优惠比例"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="门店枚举" prop="storeIds">-->
<!-- <el-input-->
<!-- v-model="queryParams.storeIds"-->
<!-- clearable-->
<!-- placeholder="请输入门店枚举"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="标签" prop="labelId">
<el-select v-model="queryParams.labelId" placeholder="请选择标签">
<el-option
v-for="item in labelList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="优惠比例" prop="discountRatio">
<el-input
v-model="queryParams.discountRatio"
clearable
placeholder="请输入优惠比例"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="门店枚举" prop="storeIds">
<el-input
v-model="queryParams.storeIds"
clearable
placeholder="请输入门店枚举"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="标签id" prop="labelId">
<el-input
v-model="queryParams.labelId"
clearable
placeholder="请输入标签id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="套餐id" prop="packId">
<el-input
v-model="queryParams.packId"
clearable
placeholder="请输入套餐id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="cron表达式" prop="cronExpression">
<el-input
v-model="queryParams.cronExpression"
clearable
placeholder="请输入cron表达式"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="套餐" prop="packId">
<el-select v-model="queryParams.packId" placeholder="请选择套餐">
<el-option
v-for="item in packList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="cron表达式" prop="cronExpression">-->
<!-- <el-input-->
<!-- v-model="queryParams.cronExpression"-->
<!-- clearable-->
<!-- placeholder="请输入cron表达式"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="是否开启" prop="isOpen">
<el-input
v-model="queryParams.isOpen"
clearable
placeholder="请输入是否开启"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input
v-model="queryParams.isDelete"
clearable
placeholder="请输入是否删除"
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.isOpen" clearable placeholder="请选择是否开启">
<el-option
v-for="dict in dict.type.store_is_use_coupon"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
<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>
......@@ -131,16 +138,39 @@
<el-table v-loading="loading" :data="activityList" @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="id"/>-->
<el-table-column align="center" label="活动名称" prop="activityName"/>
<el-table-column align="center" label="活动描述" prop="activityDescription"/>
<el-table-column align="center" label="优惠比例" prop="discountRatio"/>
<el-table-column align="center" label="门店枚举" prop="storeIds"/>
<el-table-column align="center" label="标签id" prop="labelId"/>
<el-table-column align="center" label="套餐id" prop="packId"/>
<el-table-column align="center" label="会员类型" prop="memberType" width="100px">
<template slot-scope="scope">
<dict-tag :options="dict.type.member_type" :value="scope.row.memberType"/>
</template>
</el-table-column>
<el-table-column align="center" label="适用门店" prop="storeIds" width="350">
<template slot-scope="scope">
<div v-if="scope.row.storeIds" style="display: flex;flex-wrap: wrap;width: 100%;">
<dict-tag v-for="(item ,k) in scope.row.storeIds" :key="k" :options="storeList" :value="item"
style="margin: 0 3px;"/>
</div>
</template>
</el-table-column>
<el-table-column align="center" label="标签名称" prop="labelId" width="120">
<template slot-scope="scope">
<span v-for="item in labelList" v-if="scope.row.labelId === item.id">{{ item.name }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="套餐名称" prop="packId" width="120">
<template slot-scope="scope">
<span v-for="item in packList" v-if="scope.row.packId === item.id">{{ item.name }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="cron表达式" prop="cronExpression"/>
<el-table-column align="center" label="是否开启" prop="isOpen"/>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
<el-table-column align="center" label="是否开启" prop="isOpen">
<template slot-scope="scope">
<dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.isOpen"/>
</template>
</el-table-column>
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
......@@ -173,8 +203,8 @@
/>
<!-- 添加或修改活动对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" append-to-body width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="活动名称" prop="activityName">
<el-input v-model="form.activityName" placeholder="请输入活动名称"/>
</el-form-item>
......@@ -182,26 +212,71 @@
<el-input v-model="form.activityDescription" placeholder="请输入活动描述"/>
</el-form-item>
<el-form-item label="优惠比例" prop="discountRatio">
<el-input v-model="form.discountRatio" placeholder="请输入优惠比例"/>
<el-input-number v-model="form.discountRatio" :max="100" :min="0" placeholder="请输入门槛时长"/>
</el-form-item>
<el-form-item label="会员类型" prop="memberType">
<el-select v-model="form.memberType" placeholder="请选择会员类型">
<el-option
v-for="dict in dict.type.member_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="门店枚举" prop="storeIds">
<el-input v-model="form.storeIds" placeholder="请输入门店枚举"/>
<el-form-item label="适用门店" prop="storeIds">
<el-select v-model="form.storeIds" clearable multiple placeholder="请选择适用门店">
<el-option
v-for="dict in storeList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标签id" prop="labelId">
<el-input v-model="form.labelId" placeholder="请输入标签id"/>
<el-form-item label="标签" prop="labelId">
<el-select v-model="form.labelId" clearable placeholder="请选择标签">
<el-option
v-for="item in labelList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="套餐id" prop="packId">
<el-input v-model="form.packId" placeholder="请输入套餐id"/>
<el-form-item label="套餐" prop="packId">
<el-select v-model="form.packId" clearable placeholder="请选择套餐">
<el-option
v-for="item in packList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="cron表达式" prop="cronExpression">
<el-input v-model="form.cronExpression" placeholder="请输入cron表达式"/>
<el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
<template slot="append">
<el-button type="primary" @click="handleShowCron">
生成表达式
<i class="el-icon-time el-icon--right"></i>
</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="是否开启" prop="isOpen">
<el-input v-model="form.isOpen" placeholder="请输入是否开启"/>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input v-model="form.isDelete" placeholder="请输入是否删除"/>
<el-radio-group v-model="form.isOpen">
<el-radio
v-for="dict in dict.type.store_is_use_coupon"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input v-model="form.isDelete" placeholder="请输入是否删除"/>-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
......@@ -211,14 +286,22 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="openCron" append-to-body class="scrollbar" destroy-on-close title="Cron表达式生成器">
<crontab :expression="expression" @fill="crontabFill" @hide="openCron=false"></crontab>
</el-dialog>
</div>
</template>
<script>
import {listActivity, getActivity, delActivity, addActivity, updateActivity} from "@/api/system/activity";
import Crontab from '@/components/Crontab'
import {query} from "@/api/system/pack";
import {queryList} from "@/api/system/label";
import {storeList} from '@/api/system/store';
export default {
name: "Activity",
components: {Crontab},
dicts: ['store_is_use_coupon', 'member_type'],
data() {
return {
// 遮罩层
......@@ -235,10 +318,17 @@ export default {
total: 0,
// 活动表格数据
activityList: [],
labelList: [],
packList: [],
storeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 是否显示Cron表达式弹出层
openCron: false,
// 传入的表达式
expression: "",
// 查询参数
queryParams: {
pageNum: 1,
......@@ -246,6 +336,7 @@ export default {
activityName: null,
activityDescription: null,
discountRatio: null,
memberType: null,
storeIds: null,
labelId: null,
packId: null,
......@@ -253,6 +344,9 @@ export default {
isOpen: null,
isDelete: null,
},
packParams: {
type: 0
},
// 表单参数
form: {},
// 表单校验
......@@ -261,13 +355,21 @@ export default {
},
created() {
this.getList();
this.onLabelList();
this.onPackList();
this.onStoreList();
},
methods: {
/** 查询活动列表 */
getList() {
this.loading = true;
listActivity(this.queryParams).then(response => {
this.activityList = response.rows;
this.activityList = response.rows.map(item => {
return {
...item,
storeIds: item.storeIds && item.storeIds.length ? item.storeIds.split(",") : []
}
});
this.total = response.total;
this.loading = false;
});
......@@ -284,6 +386,7 @@ export default {
activityName: null,
activityDescription: null,
discountRatio: null,
memberType: null,
storeIds: null,
labelId: null,
packId: null,
......@@ -303,11 +406,48 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
/** cron表达式按钮操作 */
handleShowCron() {
this.expression = this.form.cronExpression;
this.openCron = true;
},
/** 确定后回传值 */
crontabFill(value) {
this.form.cronExpression = value;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
onLabelList() {
queryList().then(res => {
this.labelList = res.data
})
},
onPackList() {
query(this.packParams).then(res => {
this.packList = res.data
})
},
onStoreList() {
storeList().then(res => {
this.storeList = res.data.map(obj => {
return {
...obj,
raw: {
dictSort: 1,
dictValue: "1",
listClass: "primary",
cssClass: ''
},
value: obj.id.toString(),
label: obj.name,
}
})
this.$forceUpdate();
})
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
......@@ -318,6 +458,8 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.form.isOpen = 1;
this.form.discountRatio = 50;
this.title = "添加活动";
},
/** 修改按钮操作 */
......@@ -326,6 +468,9 @@ export default {
const id = row.id || this.ids
getActivity(id).then(response => {
this.form = response.data;
if (this.form.storeIds) {
this.form.storeIds = this.form.storeIds.split(",")
}
this.open = true;
this.title = "修改活动";
});
......@@ -334,6 +479,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.storeIds = this.form.storeIds && this.form.storeIds.length ? this.form.storeIds.join() : ''
if (this.form.id != null) {
updateActivity(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
......
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-item label="用户id" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入用户id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
<!-- clearable-->
<!-- placeholder="请输入用户id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动金额" prop="variableAmount">
<el-input
v-model="queryParams.variableAmount"
......@@ -33,14 +33,14 @@
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="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入是否删除"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
......@@ -48,41 +48,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:balanceLog:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:balanceLog:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:balanceLog:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:balanceLog:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:balanceLog:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:balanceLog:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:balanceLog:export']"
......@@ -99,7 +99,7 @@
<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="id"/>-->
<el-table-column align="center" label="用户id" prop="consumerId"/>
<el-table-column align="center" label="变动金额" prop="variableAmount"/>
<el-table-column align="center" label="当前余额" prop="currentBalance"/>
......
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-item label="用户id" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入用户id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
<!-- clearable-->
<!-- placeholder="请输入用户id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="变动时长" prop="variableDuration">
<el-input
v-model="queryParams.variableDuration"
......@@ -33,14 +33,14 @@
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="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入是否删除"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
......@@ -48,41 +48,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:durationLog:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:durationLog:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:durationLog:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:durationLog:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:durationLog:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:durationLog:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:durationLog:export']"
......@@ -99,7 +99,7 @@
<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="id"/>-->
<el-table-column align="center" label="用户id" prop="consumerId"/>
<el-table-column align="center" label="变动时长" prop="variableDuration"/>
<el-table-column align="center" label="当前时长" prop="currentDuration"/>
......
src/views/system/equityMembersOrderConfig/index.vue
......@@ -9,14 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员配置id" prop="memberConfigId">
<el-input
v-model="queryParams.memberConfigId"
clearable
placeholder="请输入会员配置id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="会员配置id" prop="memberConfigId">-->
<!-- <el-input-->
<!-- v-model="queryParams.memberConfigId"-->
<!-- clearable-->
<!-- placeholder="请输入会员配置id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="所需金额" prop="requiredAmount">
<el-input
v-model="queryParams.requiredAmount"
......@@ -99,9 +99,9 @@
<el-table v-loading="loading" :data="equityMembersOrderConfigList" @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="id"/>-->
<el-table-column align="center" label="默认会员等级" prop="defaultLevel"/>
<el-table-column align="center" label="会员配置id" prop="memberConfigId"/>
<!-- <el-table-column align="center" label="会员配置id" prop="memberConfigId"/>-->
<el-table-column align="center" label="所需金额" prop="requiredAmount"/>
<el-table-column align="center" label="会员有效期" prop="validityPeriod"/>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
......
src/views/system/member/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-item label="用户id" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入用户id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员等级" prop="membershipLevel">
<el-input
v-model="queryParams.membershipLevel"
......@@ -17,14 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员配置id" prop="memberConfigId">
<el-input
v-model="queryParams.memberConfigId"
clearable
placeholder="请输入会员配置id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员有效期" prop="expirationDate">
<el-date-picker v-model="queryParams.expirationDate"
clearable
......@@ -41,14 +27,6 @@
@keyup.enter.native="handleQuery"
/>
</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>
<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>
......@@ -107,10 +85,15 @@
<el-table v-loading="loading" :data="memberList" @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="id"/>-->
<!-- <el-table-column align="center" label="用户id" prop="consumerId"/>-->
<el-table-column align="center" label="会员等级" prop="membershipLevel"/>
<el-table-column align="center" label="会员类型" prop="memberType"/>
<!-- <el-table-column align="center" label="会员类型" prop="memberType"/>-->
<el-table-column align="center" label="会员类型" prop="memberType" width="100px">
<template slot-scope="scope">
<dict-tag :options="dict.type.member_type" :value="scope.row.memberType"/>
</template>
</el-table-column>
<el-table-column align="center" label="会员配置id" prop="memberConfigId"/>
<el-table-column align="center" label="会员有效期" prop="expirationDate" width="180">
<template slot-scope="scope">
......@@ -156,6 +139,16 @@
<el-form-item label="用户id" prop="consumerId">
<el-input v-model="form.consumerId" placeholder="请输入用户id"/>
</el-form-item>
<el-form-item label="会员类型" prop="memberType">
<el-select v-model="form.memberType" placeholder="请选择会员类型">
<el-option
v-for="dict in dict.type.member_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="会员等级" prop="membershipLevel">
<el-input v-model="form.membershipLevel" placeholder="请输入会员等级"/>
</el-form-item>
......@@ -193,6 +186,7 @@ import {listMember, getMember, delMember, addMember, updateMember} from "@/api/s
export default {
name: "Member",
dicts: ['store_is_use_coupon', 'member_type'],
data() {
return {
// 遮罩层
......
src/views/system/memberConfig/index.vue
......@@ -33,30 +33,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员有效期" prop="validityPeriod">
<el-input
v-model="queryParams.validityPeriod"
clearable
placeholder="请输入会员有效期"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员进度" prop="membershipProgress">
<el-input
v-model="queryParams.membershipProgress"
clearable
placeholder="请输入会员进度"
@keyup.enter.native="handleQuery"
/>
</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="validityPeriod">-->
<!-- <el-input-->
<!-- v-model="queryParams.validityPeriod"-->
<!-- clearable-->
<!-- placeholder="请输入会员有效期"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="会员进度" prop="membershipProgress">-->
<!-- <el-input-->
<!-- v-model="queryParams.membershipProgress"-->
<!-- clearable-->
<!-- placeholder="请输入会员进度"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
<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>
......@@ -115,15 +115,20 @@
<el-table v-loading="loading" :data="memberConfigList" @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="id"/>-->
<el-table-column align="center" label="会员等级" prop="membershipLevel"/>
<el-table-column align="center" label="会员类型" prop="memberType"/>
<!-- <el-table-column align="center" label="会员类型" prop="memberType"/>-->
<el-table-column align="center" label="会员类型" prop="memberType" width="100px">
<template slot-scope="scope">
<dict-tag :options="dict.type.member_type" :value="scope.row.memberType"/>
</template>
</el-table-column>
<el-table-column align="center" label="等级名称" prop="levelName"/>
<el-table-column align="center" label="额度要求" prop="limitRequirements"/>
<el-table-column align="center" label="折扣比例" prop="discountRatio"/>
<el-table-column align="center" label="会员有效期" prop="validityPeriod"/>
<el-table-column align="center" label="会员进度" prop="membershipProgress"/>
<el-table-column align="center" label="是否删除" prop="isDelete"/>
<el-table-column align="center" label="会员有效期(年)" prop="validityPeriod"/>
<!-- <el-table-column align="center" label="会员进度" prop="membershipProgress"/>-->
<!-- <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">
......@@ -164,6 +169,16 @@
<el-form-item label="等级名称" prop="levelName">
<el-input v-model="form.levelName" placeholder="请输入等级名称"/>
</el-form-item>
<el-form-item label="会员类型" prop="memberType">
<el-select v-model="form.memberType" placeholder="请选择会员类型">
<el-option
v-for="dict in dict.type.member_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="额度要求" prop="limitRequirements">
<el-input v-model="form.limitRequirements" placeholder="请输入额度要求"/>
</el-form-item>
......@@ -173,12 +188,12 @@
<el-form-item label="会员有效期" prop="validityPeriod">
<el-input v-model="form.validityPeriod" placeholder="请输入会员有效期"/>
</el-form-item>
<el-form-item label="会员进度" prop="membershipProgress">
<el-input v-model="form.membershipProgress" placeholder="请输入会员进度"/>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input v-model="form.isDelete" placeholder="请输入是否删除"/>
</el-form-item>
<!-- <el-form-item label="会员进度" prop="membershipProgress">-->
<!-- <el-input v-model="form.membershipProgress" placeholder="请输入会员进度"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除" prop="isDelete">-->
<!-- <el-input v-model="form.isDelete" placeholder="请输入是否删除"/>-->
<!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item>
......@@ -202,6 +217,7 @@ import {
export default {
name: "MemberConfig",
dicts: ['store_is_use_coupon', 'member_type'],
data() {
return {
// 遮罩层
......
src/views/system/recharge/index.vue
......@@ -9,39 +9,39 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值金额" prop="rechargeAmount">
<el-input
v-model="queryParams.rechargeAmount"
clearable
placeholder="请输入充值金额"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值满送金额" prop="giveAmount">
<el-input
v-model="queryParams.giveAmount"
clearable
placeholder="请输入充值满送金额"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值配置表id" prop="rechargeConfId">
<el-input
v-model="queryParams.rechargeConfId"
clearable
placeholder="请输入充值配置表id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值用户ID" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入充值用户ID"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值用户手机号" prop="phone">
<!-- <el-form-item label="充值金额" prop="rechargeAmount">-->
<!-- <el-input-->
<!-- v-model="queryParams.rechargeAmount"-->
<!-- clearable-->
<!-- placeholder="请输入充值金额"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="充值满送金额" prop="giveAmount">-->
<!-- <el-input-->
<!-- v-model="queryParams.giveAmount"-->
<!-- clearable-->
<!-- placeholder="请输入充值满送金额"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="充值配置表id" prop="rechargeConfId">-->
<!-- <el-input-->
<!-- v-model="queryParams.rechargeConfId"-->
<!-- clearable-->
<!-- placeholder="请输入充值配置表id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="充值用户ID" prop="consumerId">-->
<!-- <el-input-->
<!-- v-model="queryParams.consumerId"-->
<!-- clearable-->
<!-- placeholder="请输入充值用户ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="用户手机号" prop="phone">
<el-input
v-model="queryParams.phone"
clearable
......@@ -57,30 +57,30 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">
<el-input
v-model="queryParams.isDelete"
clearable
placeholder="请输入删除标记：1-删除，0-正常"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商户平台唯一订单号" prop="outTradeNo">
<el-input
v-model="queryParams.outTradeNo"
clearable
placeholder="请输入商户平台唯一订单号"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="终端流水号" prop="terminalTrace">
<el-input
v-model="queryParams.terminalTrace"
clearable
placeholder="请输入终端流水号"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入删除标记：1-删除，0-正常"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="商户平台唯一订单号" prop="outTradeNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.outTradeNo"-->
<!-- clearable-->
<!-- placeholder="请输入商户平台唯一订单号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="终端流水号" prop="terminalTrace">-->
<!-- <el-input-->
<!-- v-model="queryParams.terminalTrace"-->
<!-- clearable-->
<!-- placeholder="请输入终端流水号"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="支付时间" prop="payTime">
<el-date-picker v-model="queryParams.payTime"
clearable
......@@ -96,41 +96,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:recharge:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:recharge:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:recharge:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:recharge:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:recharge:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:recharge:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:recharge:export']"
......@@ -147,13 +147,13 @@
<el-table v-loading="loading" :data="rechargeList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="主键" prop="id"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>-->
<el-table-column align="center" label="充值记录编号" prop="rechargeNo"/>
<el-table-column align="center" label="充值金额" prop="rechargeAmount"/>
<el-table-column align="center" label="支付方式" prop="payType"/>
<el-table-column align="center" label="充值满送金额" prop="giveAmount"/>
<el-table-column align="center" label="充值赠送方式；1-不送，2-送金额，3-送优惠券，4-送金额及优惠券" prop="giveType"/>
<el-table-column align="center" label="状态：0-待支付，1-支付成功，2-退款中，3-退款完成" prop="status"/>
<el-table-column align="center" label="充值赠送方式" prop="giveType"/>
<el-table-column align="center" label="状态" prop="status"/>
<el-table-column align="center" label="充值赠送优惠券ID" prop="consumerCouponIds"/>
<el-table-column align="center" label="充值配置表id" prop="rechargeConfId"/>
<el-table-column align="center" label="充值用户ID" prop="consumerId"/>
......@@ -163,7 +163,7 @@
<span>{{ parseTime(scope.row.rechargeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="删除标记：1-删除，0-正常" prop="isDelete"/>
<!-- <el-table-column align="center" label="删除标记：1-删除，0-正常" prop="isDelete"/>-->
<el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" label="商户平台唯一订单号" prop="outTradeNo"/>
<el-table-column align="center" label="终端流水号" prop="terminalTrace"/>
......@@ -172,26 +172,26 @@
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
<el-button
v-hasPermi="['system:recharge:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:recharge:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
<!-- <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:recharge:edit']"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:recharge:remove']"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......
src/views/system/rechargeConf/index.vue
......@@ -25,22 +25,32 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="启用禁用：1-启用，0-禁用" prop="enable">
<el-input
v-model="queryParams.enable"
clearable
placeholder="请输入启用禁用：1-启用，0-禁用"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值适用门店id" prop="storeIds">
<el-input
v-model="queryParams.storeIds"
clearable
placeholder="请输入充值适用门店id"
@keyup.enter.native="handleQuery"
/>
<!-- <el-form-item label="启用禁用：1-启用，0-禁用" prop="enable">-->
<!-- <el-input-->
<!-- v-model="queryParams.enable"-->
<!-- clearable-->
<!-- placeholder="请输入启用禁用：1-启用，0-禁用"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="启用禁用" prop="enable">
<el-select v-model="queryParams.enable" clearable placeholder="请选择是否开启">
<el-option
v-for="dict in dict.type.store_is_use_coupon"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="充值适用门店id" prop="storeIds">-->
<!-- <el-input-->
<!-- v-model="queryParams.storeIds"-->
<!-- clearable-->
<!-- placeholder="请输入充值适用门店id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
......@@ -99,12 +109,18 @@
<el-table v-loading="loading" :data="rechargeConfList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="主键" prop="id"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>-->
<el-table-column align="center" label="配置名称" prop="name"/>
<el-table-column align="center" label="充值金额" prop="rechargeAmount"/>
<el-table-column align="center" label="充值赠送方式；1-不送，2-送金额，3-送优惠券，4-送金额及优惠券" prop="giveType"/>
<!-- <el-table-column align="center" label="充值赠送方式；1-不送，2-送金额，3-送优惠券，4-送金额及优惠券" prop="giveType"/>-->
<el-table-column align="center" label="充值赠送方式" prop="giveType"/>
<el-table-column align="center" label="充值满送金额" prop="giveAmount"/>
<el-table-column align="center" label="启用禁用：1-启用，0-禁用" prop="enable"/>
<!-- <el-table-column align="center" label="启用禁用：1-启用，0-禁用" prop="enable"/>-->
<el-table-column align="center" label="启用禁用" prop="enable">
<template slot-scope="scope">
<dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.enable"/>
</template>
</el-table-column>
<el-table-column align="center" label="充值适用类型：1-平台通用，2-单门店" prop="suitType"/>
<el-table-column align="center" label="充值适用门店id" prop="storeIds"/>
<el-table-column align="center" label="备注" prop="remark"/>
......@@ -182,6 +198,7 @@ import {
export default {
name: "RechargeConf",
dicts: ['store_is_use_coupon'],
data() {
return {
// 遮罩层
......
src/views/system/rechargeCouponConf/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-item label="充值配置表id" prop="rechargeConfId">
<el-input
v-model="queryParams.rechargeConfId"
clearable
placeholder="请输入充值配置表id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充值赠送优惠券配置ID" prop="couponId">
<el-input
v-model="queryParams.couponId"
clearable
placeholder="请输入充值赠送优惠券配置ID"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="赠送券数量" prop="couponNum">
<el-input
v-model="queryParams.couponNum"
clearable
placeholder="请输入赠送券数量"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="送券价值金额：元/每张" prop="couponAmount">
<el-input
v-model="queryParams.couponAmount"
clearable
placeholder="请输入送券价值金额：元/每张"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="充值配置表id" prop="rechargeConfId">-->
<!-- <el-input-->
<!-- v-model="queryParams.rechargeConfId"-->
<!-- clearable-->
<!-- placeholder="请输入充值配置表id"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="充值赠送优惠券配置ID" prop="couponId">-->
<!-- <el-input-->
<!-- v-model="queryParams.couponId"-->
<!-- clearable-->
<!-- placeholder="请输入充值赠送优惠券配置ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="赠送券数量" prop="couponNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.couponNum"-->
<!-- clearable-->
<!-- placeholder="请输入赠送券数量"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="送券价值金额：元/每张" prop="couponAmount">-->
<!-- <el-input-->
<!-- v-model="queryParams.couponAmount"-->
<!-- clearable-->
<!-- placeholder="请输入送券价值金额：元/每张"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
......@@ -91,7 +91,7 @@
<el-table v-loading="loading" :data="rechargeCouponConfList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="主键" prop="id"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>-->
<el-table-column align="center" label="充值配置表id" prop="rechargeConfId"/>
<el-table-column align="center" label="充值赠送优惠券配置ID" prop="couponId"/>
<el-table-column align="center" label="赠送券数量" prop="couponNum"/>
......
src/views/system/rechargeRefund/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-item label="充值记录表ID" prop="rechargeId">
<el-input
v-model="queryParams.rechargeId"
clearable
placeholder="请输入充值记录表ID"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="充值记录表ID" prop="rechargeId">-->
<!-- <el-input-->
<!-- v-model="queryParams.rechargeId"-->
<!-- clearable-->
<!-- placeholder="请输入充值记录表ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="系统计算退款金额" prop="refundAmount">
<el-input
v-model="queryParams.refundAmount"
......@@ -17,22 +17,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="已使用优惠券ID" prop="usedCouponIds">
<el-input
v-model="queryParams.usedCouponIds"
clearable
placeholder="请输入已使用优惠券ID"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="未使用优惠券ID" prop="notusedCouponIds">
<el-input
v-model="queryParams.notusedCouponIds"
clearable
placeholder="请输入未使用优惠券ID"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="已使用优惠券ID" prop="usedCouponIds">-->
<!-- <el-input-->
<!-- v-model="queryParams.usedCouponIds"-->
<!-- clearable-->
<!-- placeholder="请输入已使用优惠券ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="未使用优惠券ID" prop="notusedCouponIds">-->
<!-- <el-input-->
<!-- v-model="queryParams.notusedCouponIds"-->
<!-- clearable-->
<!-- placeholder="请输入未使用优惠券ID"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="实际退款金额" prop="actualRefundAmount">
<el-input
v-model="queryParams.actualRefundAmount"
......@@ -65,14 +65,14 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知" prop="isSendSms">
<el-input
v-model="queryParams.isSendSms"
clearable
placeholder="请输入退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知" prop="isSendSms">-->
<!-- <el-input-->
<!-- v-model="queryParams.isSendSms"-->
<!-- clearable-->
<!-- placeholder="请输入退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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>
......@@ -80,41 +80,41 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:rechargeRefund:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:rechargeRefund:edit']"
:disabled="single"
icon="el-icon-edit"
plain
size="mini"
type="success"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:rechargeRefund:remove']"
:disabled="multiple"
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="handleDelete"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:rechargeRefund:add']"-->
<!-- icon="el-icon-plus"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="handleAdd"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:rechargeRefund:edit']"-->
<!-- :disabled="single"-->
<!-- icon="el-icon-edit"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- @click="handleUpdate"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:rechargeRefund:remove']"-->
<!-- :disabled="multiple"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="handleDelete"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
v-hasPermi="['system:rechargeRefund:export']"
......@@ -131,13 +131,15 @@
<el-table v-loading="loading" :data="rechargeRefundList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<el-table-column align="center" label="主键" prop="id"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>-->
<el-table-column align="center" label="充值记录表ID" prop="rechargeId"/>
<el-table-column align="center" label="系统计算退款金额" prop="refundAmount"/>
<el-table-column align="center" label="已使用优惠券ID" prop="usedCouponIds"/>
<el-table-column align="center" label="未使用优惠券ID" prop="notusedCouponIds"/>
<el-table-column align="center" label="实际退款金额" prop="actualRefundAmount"/>
<el-table-column align="center" label="审核状态：0-待审核，2-审核通过，3-审核不通过" prop="status"/>
<!-- <el-table-column align="center" label="审核状态：0-待审核，2-审核通过，3-审核不通过" prop="status"/>-->
<el-table-column align="center" label="审核状态" prop="status"/>
<el-table-column align="center" label="退款审核说明" prop="description"/>
<el-table-column align="center" label="退款原因" prop="reason"/>
<el-table-column align="center" label="申请时间" prop="applyForDate" width="180">
......@@ -145,28 +147,29 @@
<span>{{ parseTime(scope.row.applyForDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知" prop="isSendSms"/>
<!-- <el-table-column align="center" label="退款短信通知运维人员：1-已发送短信通知，0-未发送短信通知" prop="isSendSms"/>-->
<el-table-column align="center" label="退款短信通知运维人员" prop="isSendSms"/>
<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:rechargeRefund:edit']"
icon="el-icon-edit"
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:rechargeRefund:remove']"
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
<!-- <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:rechargeRefund:edit']"-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:rechargeRefund:remove']"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
......
src/views/system/wallet/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-item label="用户id" prop="consumerId">
<el-input
v-model="queryParams.consumerId"
clearable
placeholder="请输入用户id"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="余额" prop="balance">
<el-input
v-model="queryParams.balance"
......@@ -33,14 +25,7 @@
@keyup.enter.native="handleQuery"
/>
</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>
<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>
......@@ -99,8 +84,8 @@
<el-table v-loading="loading" :data="walletList" @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="id"/>-->
<!-- <el-table-column align="center" label="用户id" prop="consumerId"/>-->
<el-table-column align="center" label="余额" prop="balance"/>
<el-table-column align="center" label="时长" prop="remainingDuration"/>
<el-table-column align="center" label="积分" prop="remainingIntegral"/>
......@@ -139,9 +124,9 @@
<!-- 添加或修改会员钱包对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户id" prop="consumerId">
<el-input v-model="form.consumerId" placeholder="请输入用户id"/>
</el-form-item>
<!-- <el-form-item label="用户id" prop="consumerId">-->
<!-- <el-input v-model="form.consumerId" placeholder="请输入用户id"/>-->
<!-- </el-form-item>-->
<el-form-item label="余额" prop="balance">
<el-input v-model="form.balance" placeholder="请输入余额"/>
</el-form-item>
......
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