Skip to content

S
snow-guizhou-web-frontend
提交 e8603a86 作者: 郁骅焌
操作

Merge branch 'master' of http://47.103.50.109:8091/snow/snow-guizhou-web-frontend

上级 c698518d 15c38f3d
正在显示 包含 60 行增加 和 38 行删除
src/api/coupon/couponData.js
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询列表
export function verificationList(data) {
return request({
url: '/coupon/coupon/xhDatalist',
url: '/xh/coupon/coupon/xhDatalist',
method: 'post',
data: data
})
......
src/views/coupon/couponData/verificationList.vue
......@@ -11,10 +11,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="openid" prop="receiveUserAccount">
<el-form-item label="领取人" prop="receiveUserAccount">
<el-input
v-model="queryParams.receiveUserAccount"
placeholder="请输入权限字符"
placeholder="请输入领取人"
clearable
size="small"
style="width: 240px"
......@@ -29,7 +29,7 @@
size="small"
style="width: 240px"
>I
<!-- NI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
<!-- INI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
<el-option
key=""
label="全部"
......@@ -50,9 +50,40 @@
label="已失效"
value="EXPIRYED"
/>
<el-option
key="ERR"
label="发放失败"
value="ERR"
/>
<el-option
key="X"
label="已删除"
value="X"
/>
</el-select>
</el-form-item>
<el-form-item label="发放渠道" prop="sendChannel">
<el-input
v-model="queryParams.sendChannel"
placeholder="请输入发放渠道"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="核销时间">
<el-date-picker
v-model="dateRange"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="核销人" prop="verificationChannelEmployeeName">
<el-input
v-model="queryParams.verificationChannelEmployeeName"
......@@ -73,18 +104,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="核销时间">
<el-date-picker
v-model="dateRange"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<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>
......@@ -107,41 +127,44 @@
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column label="id" prop="roleId" width="60" >
<template slot-scope="scope,index">
{{index}}
<template slot-scope="scope">
{{
(scope.$index + 1)
}}
</template>
</el-table-column>
<el-table-column label="优惠券标题" prop="couponName" width="120" />
<el-table-column label="领取人微信openid" prop="receiveUserAccount" :show-overflow-tooltip="true" width="150" />
<el-table-column label="领取人" prop="receiveUserAccount" :show-overflow-tooltip="true" width="150" />
<el-table-column label="微信昵称" prop="receiveNickName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="领取时间" prop="receiveTime" width="100" />
<el-table-column label="券码" prop="couponCode" width="100" />
<el-table-column label="状态" align="center" width="100">
<el-table-column label="领取时间" prop="receiveTime" width="150" />
<el-table-column label="券码" prop="couponCode" width="150" />
<el-table-column label="状态" align="center" width="120">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
<!-- INI-已领取待核销, USED-已核销, EXPIRYED-已失效, ERR-发放失败, X-已删除 -->
<span v-if="scope.row.state=='INI'">已领取待核销</span>
<span v-if="scope.row.state=='USED'">已核销</span>
<span v-if="scope.row.state=='EXPIRYED'">已失效</span>
<span v-if="scope.row.state=='ERR'">发放失败</span>
<span v-if="scope.row.state=='X'">已删除</span>
</template>
</el-table-column>
<el-table-column label="核销时间" align="center" prop="verificationTime" width="180">
<el-table-column label="核销时间" align="center" prop="verificationTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.verificationTime) }}</span>
</template>
</el-table-column>
<el-table-column label="核销人" align="center" prop="verificationChannelEmployeeName" width="180"/>
<el-table-column label="核销门店" align="center" prop="verificationChannelName" width="180"/>
<el-table-column label="核销人" align="center" prop="verificationChannelEmployeeName" width="150"/>
<el-table-column label="核销门店" align="center" prop="verificationChannelName" width="150"/>
<el-table-column label="使用人" align="center" prop="receiveNickName" width="150"/>
<el-table-column label="会员体系ID" align="center" prop="memberSysId" width="150"/>
<el-table-column label="发放渠道" align="center" prop="sendChannel" width="150"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:page.sync="queryParams.pageIndex"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -230,10 +253,9 @@ export default {
let params = this.queryParams;
if(this.dateRange.length!=0){
params.verificationStartTime=this.dateRange[0];
params.verificationEndTime=this.dateRange[1];
}
else{
params.verificationStartTime=this.dateRange[1];
}
verificationList(params).then(
response => {
this.roleList = response.rows;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论