|
@@ -1,16 +1,13 @@
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
|
- <el-form-item label="姓名">
|
|
|
|
- <el-input v-model="queryParams['user.name']" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
+ <el-form-item label="姓名" prop="userName">
|
|
|
|
+ <el-input v-model="queryParams.userName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="手机号">
|
|
|
|
- <el-input v-model="queryParams['user.phone']" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
+ <el-form-item label="手机号" prop="userPhone">
|
|
|
|
+ <el-input v-model="queryParams.userPhone" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="商家名称">
|
|
|
|
- <el-input v-model="queryParams['discountInfo.name']" placeholder="请输入商家名称" clearable @keyup.enter.native="handleQuery"/>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="社区" prop="community">
|
|
|
|
|
|
+ <el-form-item label="发行社区" prop="community">
|
|
<el-select v-model="queryParams.community" placeholder="请选择">
|
|
<el-select v-model="queryParams.community" placeholder="请选择">
|
|
<el-option v-for="dict in dict.type.community" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
<el-option v-for="dict in dict.type.community" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -20,11 +17,11 @@
|
|
<el-option v-for="dict in dict.type.receive_tags" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
<el-option v-for="dict in dict.type.receive_tags" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!-- <el-form-item label="状态" prop="tags">
|
|
|
|
|
|
+ <el-form-item label="状态" prop="status">
|
|
<el-select v-model="queryParams.status" placeholder="请选择">
|
|
<el-select v-model="queryParams.status" placeholder="请选择">
|
|
<el-option v-for="dict in dict.type.voucher_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
<el-option v-for="dict in dict.type.voucher_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- </el-form-item> -->
|
|
|
|
|
|
+ </el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -45,14 +42,15 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="taskList">
|
|
<el-table v-loading="loading" :data="taskList">
|
|
<el-table-column label="序号" type="index" width="50" />
|
|
<el-table-column label="序号" type="index" width="50" />
|
|
- <el-table-column label="代金券名称" align="center" prop="discountInfo.name" />
|
|
|
|
<el-table-column label="姓名" align="center" prop="user.name" />
|
|
<el-table-column label="姓名" align="center" prop="user.name" />
|
|
<el-table-column label="手机号" align="center" prop="user.phone" />
|
|
<el-table-column label="手机号" align="center" prop="user.phone" />
|
|
- <el-table-column label="领取群体" align="center" prop="discountInfo.tags" />
|
|
|
|
|
|
+ <el-table-column label="代金券名称" align="center" prop="discountInfo.name" />
|
|
<el-table-column label="代金券种类" align="center" prop="discountInfo.categoryText" />
|
|
<el-table-column label="代金券种类" align="center" prop="discountInfo.categoryText" />
|
|
|
|
+ <el-table-column label="发行社区" align="center" prop="discountInfo.community" />
|
|
|
|
+ <el-table-column label="领取群体" align="center" prop="discountInfo.tags" />
|
|
<el-table-column label="面额" align="center" prop="discountInfo.money" />
|
|
<el-table-column label="面额" align="center" prop="discountInfo.money" />
|
|
<el-table-column label="状态" align="center" prop="statusText" />
|
|
<el-table-column label="状态" align="center" prop="statusText" />
|
|
- <el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
|
|
|
|
+ <el-table-column label="兑换时间" align="center" prop="createTime" width="180">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
</template>
|
|
</template>
|
|
@@ -78,7 +76,7 @@
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "voucher",
|
|
name: "voucher",
|
|
- dicts: ['receive_tags', 'voucher_category', 'voucher_status', 'community'],
|
|
|
|
|
|
+ dicts: ['receive_tags', 'voucher_category', 'voucher_status', 'community', 'goods_status'],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
// 遮罩层
|
|
// 遮罩层
|
|
@@ -91,6 +89,11 @@
|
|
queryParams: {
|
|
queryParams: {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
|
+ userName:'',
|
|
|
|
+ userPhone:'',
|
|
|
|
+ community:'',
|
|
|
|
+ tags:'',
|
|
|
|
+ status:''
|
|
},
|
|
},
|
|
voucher_category: []
|
|
voucher_category: []
|
|
};
|
|
};
|