Skip to content

G
gxpt_web
Commit d22b201f by 吕明尚
Options

修改后台管理系统

parent 0505e723
Showing with 392 additions and 254 deletions
src/views/system/equityMembersOrder/index.vue
...@@ -17,30 +17,30 @@ ...@@ -17,30 +17,30 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="商户订单号" prop="outTradeNo"> <!-- <el-form-item label="商户订单号" prop="outTradeNo">-->
<el-input <!-- <el-input-->
v-model="queryParams.outTradeNo" <!-- v-model="queryParams.outTradeNo"-->
clearable <!-- clearable-->
placeholder="请输入商户订单号" <!-- placeholder="请输入商户订单号"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="终端流水号" prop="terminalTrace"> <!-- <el-form-item label="终端流水号" prop="terminalTrace">-->
<el-input <!-- <el-input-->
v-model="queryParams.terminalTrace" <!-- v-model="queryParams.terminalTrace"-->
clearable <!-- clearable-->
placeholder="请输入终端流水号" <!-- placeholder="请输入终端流水号"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="支付时间" prop="payTime"> <!-- <el-form-item label="支付时间" prop="payTime">-->
<el-date-picker v-model="queryParams.payTime" <!-- <el-date-picker v-model="queryParams.payTime"-->
clearable <!-- clearable-->
placeholder="请选择支付时间" <!-- placeholder="请选择支付时间"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd"> <!-- value-format="yyyy-MM-dd">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="会员昵称" prop="nickName"> <el-form-item label="会员昵称" prop="nickName">
<el-input <el-input
v-model="queryParams.nickName" v-model="queryParams.nickName"
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
placeholder="请输入会员手机号" placeholder="请输入会员手机号"
/> />
</el-form-item> </el-form-item>
<el-form-item label="下单时间">
<el-date-picker
v-model="dateValue"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
range-separator="至"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<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-search" size="mini" type="primary" @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>
...@@ -114,14 +126,15 @@ ...@@ -114,14 +126,15 @@
<el-table v-loading="loading" :data="equityMembersOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="equityMembersOrderList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <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="equityOrderNo" width="180"/>
<el-table-column align="center" label="会员昵称" prop="nickName"/> <el-table-column align="center" label="会员昵称" prop="nickName"/>
<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="phone"/> <el-table-column align="center" label="会员手机号" prop="phone" width="110"/>
<el-table-column align="center" label="权益订单编号" prop="equityOrderNo" width="190"/>
<el-table-column align="center" label="订单金额" prop="payPrice"/> <el-table-column align="center" label="订单金额" prop="payPrice"/>
<!-- <el-table-column align="center" label="权益会员订单配置id" prop="equityMembersConfigId"/>--> <!-- <el-table-column align="center" label="权益会员订单配置id" prop="equityMembersConfigId"/>-->
<el-table-column align="center" label="支付类型" prop="payType"> <el-table-column align="center" label="支付类型" prop="payType">
...@@ -130,12 +143,20 @@ ...@@ -130,12 +143,20 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="商户订单号" prop="outTradeNo"/>--> <!-- <el-table-column align="center" label="商户订单号" prop="outTradeNo"/>-->
<el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/> <!-- <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>-->
<el-table-column align="center" label="支付状态" prop="payStatus"> <el-table-column align="center" label="支付状态" prop="payStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/> <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下单时间" prop="createTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
<!-- </template>-->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="支付时间" prop="payTime" width="180"> <el-table-column align="center" label="支付时间" prop="payTime" width="180">
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>--> <!-- <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
...@@ -249,6 +270,7 @@ export default { ...@@ -249,6 +270,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateValue: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -291,6 +313,13 @@ export default { ...@@ -291,6 +313,13 @@ export default {
/** 查询权益会员订单列表 */ /** 查询权益会员订单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.dateValue && this.dateValue.length > 0) {
this.queryParams.startDate = this.dateValue[0];
this.queryParams.endDate = this.dateValue[1];
} else {
this.queryParams.startDate = null;
this.queryParams.endDate = null;
}
listEquityMembersOrder(this.queryParams).then(response => { listEquityMembersOrder(this.queryParams).then(response => {
this.equityMembersOrderList = response.rows; this.equityMembersOrderList = response.rows;
this.total = response.total; this.total = response.total;
...@@ -331,6 +360,7 @@ export default { ...@@ -331,6 +360,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateValue = null;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
......
src/views/system/equityMembersOrderConfig/index.vue
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<!-- <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="name"/> <el-table-column align="center" label="配置名称" prop="name"/>
<!-- <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="defaultLevel"/>
<el-table-column align="center" label="所需金额" prop="requiredAmount"/> <el-table-column align="center" label="所需金额" prop="requiredAmount"/>
<el-table-column align="center" label="会员有效期" prop="validityPeriod"/> <el-table-column align="center" label="会员有效期" prop="validityPeriod"/>
<el-table-column align="center" label="赠送积分" prop="giftPoints"/> <el-table-column align="center" label="赠送积分" prop="giftPoints"/>
...@@ -144,6 +145,10 @@ ...@@ -144,6 +145,10 @@
<el-form-item label="会员配置名称" prop="name"> <el-form-item label="会员配置名称" prop="name">
<el-input v-model="form.name" placeholder="请输入会员配置名称"/> <el-input v-model="form.name" placeholder="请输入会员配置名称"/>
</el-form-item> </el-form-item>
<el-form-item label="默认会员等级NP" prop="defaultLevel">
<el-input-number v-model="form.defaultLevel" :max="100" :min="0"/>
<!-- <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>-->
</el-form-item>
<el-form-item label="所需金额" prop="requiredAmount"> <el-form-item label="所需金额" prop="requiredAmount">
<el-input-number v-model="form.requiredAmount" :max="100" :min="0"/> <el-input-number v-model="form.requiredAmount" :max="100" :min="0"/>
<!-- <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>--> <!-- <el-input v-model="form.requiredAmount" placeholder="请输入所需金额"/>-->
......
src/views/system/monthlyCardLog/index.vue
<template> <template>
<div class="app-container"> <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" label-width="100px" size="small">
<el-form-item label="用户月卡id" prop="consumerMonthlyCardId"> <!-- <el-form-item label="用户月卡id" prop="consumerMonthlyCardId">-->
<el-input <!-- <el-input-->
v-model="queryParams.consumerMonthlyCardId" <!-- v-model="queryParams.consumerMonthlyCardId"-->
clearable <!-- clearable-->
placeholder="请输入用户月卡id" <!-- placeholder="请输入用户月卡id"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="用户ID" prop="consumerId"> <!-- <el-form-item label="用户ID" prop="consumerId">-->
<el-input <!-- <el-input-->
v-model="queryParams.consumerId" <!-- v-model="queryParams.consumerId"-->
clearable <!-- clearable-->
placeholder="请输入用户ID" <!-- placeholder="请输入用户ID"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="用户手机号" prop="phone"> <el-form-item label="用户手机号" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
...@@ -25,30 +25,30 @@ ...@@ -25,30 +25,30 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="使用时长" prop="useDuration"> <!-- <el-form-item label="使用时长" prop="useDuration">-->
<el-input <!-- <el-input-->
v-model="queryParams.useDuration" <!-- v-model="queryParams.useDuration"-->
clearable <!-- clearable-->
placeholder="请输入使用时长" <!-- placeholder="请输入使用时长"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="剩余时长" prop="residueDuration"> <!-- <el-form-item label="剩余时长" prop="residueDuration">-->
<el-input <!-- <el-input-->
v-model="queryParams.residueDuration" <!-- v-model="queryParams.residueDuration"-->
clearable <!-- clearable-->
placeholder="请输入剩余时长" <!-- placeholder="请输入剩余时长"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="删除标记：1-删除，0-正常" prop="isDelete"> <!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">-->
<el-input <!-- <el-input-->
v-model="queryParams.isDelete" <!-- v-model="queryParams.isDelete"-->
clearable <!-- clearable-->
placeholder="请输入删除标记：1-删除，0-正常" <!-- placeholder="请输入删除标记：1-删除，0-正常"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<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-search" size="mini" type="primary" @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>
...@@ -56,41 +56,41 @@ ...@@ -56,41 +56,41 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardLog:add']" <!-- v-hasPermi="['system:monthlyCardLog:add']"-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="primary" <!-- type="primary"-->
@click="handleAdd" <!-- @click="handleAdd"-->
>新增 <!-- >新增-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardLog:edit']" <!-- v-hasPermi="['system:monthlyCardLog:edit']"-->
:disabled="single" <!-- :disabled="single"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="success" <!-- type="success"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardLog:remove']" <!-- v-hasPermi="['system:monthlyCardLog:remove']"-->
:disabled="multiple" <!-- :disabled="multiple"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="danger" <!-- type="danger"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:monthlyCardLog:export']" v-hasPermi="['system:monthlyCardLog:export']"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="monthlyCardLogList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="monthlyCardLogList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <!-- <el-table-column align="center" type="selection" width="55"/>-->
<!-- <el-table-column label="主键" align="center" prop="id" />--> <!-- <el-table-column label="主键" align="center" prop="id" />-->
<!-- <el-table-column label="用户月卡id" align="center" prop="consumerMonthlyCardId" />--> <!-- <el-table-column label="用户月卡id" align="center" prop="consumerMonthlyCardId" />-->
<!-- <el-table-column label="用户ID" align="center" prop="consumerId" />--> <!-- <el-table-column label="用户ID" align="center" prop="consumerId" />-->
......
src/views/system/monthlyCardOrder/index.vue
<template> <template>
<div class="app-container"> <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="月卡购买记录编号" prop="monthlyCardNo"> <el-form-item label="订单编号" prop="monthlyCardNo">
<el-input <el-input
v-model="queryParams.monthlyCardNo" v-model="queryParams.monthlyCardNo"
clearable clearable
placeholder="请输入月卡购买记录编号" placeholder="请输入订单编号"
@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="monthlyCardAmount">
<el-input
v-model="queryParams.monthlyCardAmount"
clearable
placeholder="请输入月卡购买金额"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="月卡配置id" prop="monthlyCardConfId">
<el-input
v-model="queryParams.monthlyCardConfId"
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" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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="monthlyCardAmount">-->
<!-- <el-input-->
<!-- v-model="queryParams.monthlyCardAmount"-->
<!-- clearable-->
<!-- placeholder="请输入月卡购买金额"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="月卡配置id" prop="monthlyCardConfId">-->
<!-- <el-input-->
<!-- v-model="queryParams.monthlyCardConfId"-->
<!-- 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="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
...@@ -57,22 +57,41 @@ ...@@ -57,22 +57,41 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="支付时间" prop="payTime"> <el-form-item label="会员昵称" prop="nickName">
<el-date-picker v-model="queryParams.payTime"
clearable
placeholder="请选择支付时间"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="是否删除(0:否,1:是)" prop="isDelete">
<el-input <el-input
v-model="queryParams.isDelete" v-model="queryParams.nickName"
clearable clearable
placeholder="请输入是否删除(0:否,1:是)" placeholder="请输入会员昵称"
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="下单时间">
<el-date-picker
v-model="dateValue"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
range-separator="至"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="支付时间" prop="payTime">-->
<!-- <el-date-picker v-model="queryParams.payTime"-->
<!-- clearable-->
<!-- placeholder="请选择支付时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除(0:否,1:是)" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- clearable-->
<!-- placeholder="请输入是否删除(0:否,1:是)"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<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-search" size="mini" type="primary" @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>
...@@ -80,41 +99,41 @@ ...@@ -80,41 +99,41 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardOrder:add']" <!-- v-hasPermi="['system:monthlyCardOrder:add']"-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="primary" <!-- type="primary"-->
@click="handleAdd" <!-- @click="handleAdd"-->
>新增 <!-- >新增-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardOrder:edit']" <!-- v-hasPermi="['system:monthlyCardOrder:edit']"-->
:disabled="single" <!-- :disabled="single"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="success" <!-- type="success"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['system:monthlyCardOrder:remove']" <!-- v-hasPermi="['system:monthlyCardOrder:remove']"-->
:disabled="multiple" <!-- :disabled="multiple"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="danger" <!-- type="danger"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:monthlyCardOrder:export']" v-hasPermi="['system:monthlyCardOrder:export']"
...@@ -130,35 +149,49 @@ ...@@ -130,35 +149,49 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="monthlyCardOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="monthlyCardOrderList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <!-- <el-table-column align="center" type="selection" width="55"/>-->
<!-- <el-table-column label="主键" align="center" prop="id" />--> <!-- <el-table-column label="主键" align="center" prop="id" />-->
<el-table-column align="center" label="订单编号" prop="monthlyCardNo" width="180"/>
<el-table-column align="center" label="用户昵称" prop="nickName"/> <el-table-column align="center" label="用户昵称" prop="nickName"/>
<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="phone"/> <el-table-column align="center" label="用户手机号" prop="phone" width="110"/>
<el-table-column align="center" label="月卡购买记录编号" prop="monthlyCardNo"/>
<el-table-column align="center" label="扫呗平台唯一订单号" prop="outTradeNo"/> <!-- <el-table-column align="center" label="扫呗订单号" prop="outTradeNo"/>-->
<el-table-column align="center" label="商户订单号" prop="terminalTrace"/> <!-- <el-table-column align="center" label="商户订单号" prop="terminalTrace"/>-->
<el-table-column align="center" label="月卡购买金额" prop="monthlyCardAmount"/>
<el-table-column align="center" label="月卡名称" prop="confName"/> <el-table-column align="center" label="月卡名称" prop="confName"/>
<el-table-column align="center" label="月卡购买金额" prop="monthlyCardAmount"/>
<el-table-column align="center" label="月卡天数" prop="monthlyCardDays"/>
<el-table-column align="center" label="每天免费时长" prop="freeDuration"/>
<!-- <el-table-column label="月卡金额" align="center" prop="confAmount" />--> <!-- <el-table-column label="月卡金额" align="center" prop="confAmount" />-->
<!-- <el-table-column label="月卡配置id" align="center" prop="monthlyCardConfId" />--> <!-- <el-table-column label="月卡配置id" align="center" prop="monthlyCardConfId" />-->
<!-- <el-table-column label="用户ID" align="center" prop="consumerId" />--> <!-- <el-table-column label="用户ID" align="center" prop="consumerId" />-->
<el-table-column align="center" label="支付方式" prop="payType"/> <!-- <el-table-column align="center" label="支付方式" prop="payType"/>-->
<el-table-column align="center" label="支付类型" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payType"/>
</template>
</el-table-column>
<el-table-column align="center" label="订单状态" prop="payStatus"> <el-table-column align="center" label="订单状态" prop="payStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/> <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下单时间" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="支付时间" prop="payTime" width="180"> <el-table-column align="center" label="支付时间" prop="payTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否删除(0:否,1:是)" prop="isDelete"/> <!-- <el-table-column align="center" label="是否删除(0:否,1:是)" prop="isDelete"/>-->
<el-table-column align="center" label="备注" prop="remark"/> <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" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -248,7 +281,7 @@ import { ...@@ -248,7 +281,7 @@ import {
export default { export default {
name: "MonthlyCardOrder", name: "MonthlyCardOrder",
dicts: ['order_pay_status'], dicts: ['order_pay_status', 'store_pay_ways'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -269,6 +302,7 @@ export default { ...@@ -269,6 +302,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateValue: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -314,6 +348,13 @@ export default { ...@@ -314,6 +348,13 @@ export default {
/** 查询月卡订单列表 */ /** 查询月卡订单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.dateValue && this.dateValue.length > 0) {
this.queryParams.startDate = this.dateValue[0];
this.queryParams.endDate = this.dateValue[1];
} else {
this.queryParams.startDate = null;
this.queryParams.endDate = null;
}
listMonthlyCardOrder(this.queryParams).then(response => { listMonthlyCardOrder(this.queryParams).then(response => {
this.monthlyCardOrderList = response.rows; this.monthlyCardOrderList = response.rows;
this.total = response.total; this.total = response.total;
...@@ -356,6 +397,7 @@ export default { ...@@ -356,6 +397,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateValue = null;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
......
src/views/system/order/index.vue
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="columns[0].visible" align="center" label="订单编号" prop="orderNo" width="150"/> <el-table-column v-if="columns[0].visible" align="center" label="订单编号" prop="orderNo" width="180"/>
<el-table-column v-if="columns[1].visible" label="订单类型" align="center" prop="orderType"> <el-table-column v-if="columns[1].visible" label="订单类型" align="center" prop="orderType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_order_type" :value="scope.row.orderType"/> <dict-tag :options="dict.type.store_order_type" :value="scope.row.orderType"/>
......
src/views/system/recharge/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small"> <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<el-form-item label="充值记录编号" prop="rechargeNo"> <el-form-item label="充值订单编号" prop="rechargeNo">
<el-input <el-input
v-model="queryParams.rechargeNo" v-model="queryParams.rechargeNo"
clearable clearable
placeholder="请输入充值记录编号" placeholder="请输入充值订单编号"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
...@@ -56,13 +56,25 @@ ...@@ -56,13 +56,25 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="充值时间" prop="rechargeDate"> <!-- <el-form-item label="充值时间" prop="rechargeDate">-->
<el-date-picker v-model="queryParams.rechargeDate" <!-- <el-date-picker v-model="queryParams.rechargeDate"-->
clearable <!-- clearable-->
placeholder="请选择充值时间" <!-- placeholder="请选择充值时间"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd"> <!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="下单时间">
<el-date-picker
v-model="dateValue"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
range-separator="至"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">--> <!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">-->
<!-- <el-input--> <!-- <el-input-->
...@@ -88,14 +100,14 @@ ...@@ -88,14 +100,14 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="支付时间" prop="payTime"> <!-- <el-form-item label="支付时间" prop="payTime">-->
<el-date-picker v-model="queryParams.payTime" <!-- <el-date-picker v-model="queryParams.payTime"-->
clearable <!-- clearable-->
placeholder="请选择支付时间" <!-- placeholder="请选择支付时间"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd"> <!-- value-format="yyyy-MM-dd">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<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-search" size="mini" type="primary" @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>
...@@ -156,15 +168,16 @@ ...@@ -156,15 +168,16 @@
<el-table-column align="center" type="selection"/> <el-table-column align="center" type="selection"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>--> <!-- <el-table-column align="center" label="主键" prop="id"/>-->
<!-- <el-table-column align="center" label="商户平台唯一订单号" prop="outTradeNo"/>--> <!-- <el-table-column align="center" label="商户平台唯一订单号" prop="outTradeNo"/>-->
<el-table-column align="center" label="充值订单编号" prop="rechargeNo" width="180"/>
<el-table-column align="center" label="用户昵称" prop="nickName"/> <el-table-column align="center" label="用户昵称" prop="nickName"/>
<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="phone" width="160"/> <el-table-column align="center" label="用户手机号" prop="phone" width="110"/>
<el-table-column align="center" label="充值记录编号" prop="rechargeNo" width="180"/>
<el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/> <!-- <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>-->
<el-table-column align="center" label="充值金额" prop="rechargeAmount"/> <el-table-column align="center" label="充值金额" prop="rechargeAmount"/>
<el-table-column align="center" label="支付方式" prop="payType"> <el-table-column align="center" label="支付方式" prop="payType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -181,7 +194,7 @@ ...@@ -181,7 +194,7 @@
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="充值赠送优惠券ID" prop="consumerCouponIds"/>--> <!-- <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="rechargeConfId"/>-->
<el-table-column align="center" label="充值时间" prop="rechargeDate" width="180"> <el-table-column align="center" label="下单时间" prop="rechargeDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.rechargeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.rechargeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
...@@ -310,6 +323,7 @@ export default { ...@@ -310,6 +323,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateValue: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -376,6 +390,13 @@ export default { ...@@ -376,6 +390,13 @@ export default {
/** 查询充值记录列表 */ /** 查询充值记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.dateValue && this.dateValue.length > 0) {
this.queryParams.startDate = this.dateValue[0];
this.queryParams.endDate = this.dateValue[1];
} else {
this.queryParams.startDate = null;
this.queryParams.endDate = null;
}
listRecharge(this.queryParams).then(response => { listRecharge(this.queryParams).then(response => {
this.rechargeList = response.rows; this.rechargeList = response.rows;
this.total = response.total; this.total = response.total;
...@@ -422,6 +443,7 @@ export default { ...@@ -422,6 +443,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateValue = null;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
......
src/views/system/secondaryCardLog/index.vue
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="secondaryCardLogList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="secondaryCardLogList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <!-- <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 label="用户次卡id" align="center" prop="consumerSecondaryCardId" />--> <!-- <el-table-column label="用户次卡id" align="center" prop="consumerSecondaryCardId" />-->
<!-- <el-table-column label="用户ID" align="center" prop="consumerId" />--> <!-- <el-table-column label="用户ID" align="center" prop="consumerId" />-->
<el-table-column align="center" label="用户昵称" prop="nickName"/> <el-table-column align="center" label="用户昵称" prop="nickName"/>
......
src/views/system/secondaryCardOrder/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small"> <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<el-form-item label="订单编号" prop="secondaryCardNo"> <el-form-item label="订单编号" prop="secondaryCardNo">
<el-input <el-input
v-model="queryParams.secondaryCardNo" v-model="queryParams.secondaryCardNo"
...@@ -9,22 +9,22 @@ ...@@ -9,22 +9,22 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="扫呗订单号" prop="outTradeNo"> <!-- <el-form-item label="扫呗订单号" prop="outTradeNo">-->
<el-input <!-- <el-input-->
v-model="queryParams.outTradeNo" <!-- v-model="queryParams.outTradeNo"-->
clearable <!-- clearable-->
placeholder="请输入扫呗平台唯一订单号" <!-- placeholder="请输入扫呗平台唯一订单号"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="商户订单号" prop="terminalTrace"> <!-- <el-form-item label="商户订单号" prop="terminalTrace">-->
<el-input <!-- <el-input-->
v-model="queryParams.terminalTrace" <!-- v-model="queryParams.terminalTrace"-->
clearable <!-- clearable-->
placeholder="请输入商户订单号" <!-- placeholder="请输入商户订单号"-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="次卡购买金额" prop="secondaryCardAmount">--> <!-- <el-form-item label="次卡购买金额" prop="secondaryCardAmount">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.secondaryCardAmount"--> <!-- v-model="queryParams.secondaryCardAmount"-->
...@@ -57,13 +57,32 @@ ...@@ -57,13 +57,32 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="支付时间" prop="payTime"> <el-form-item label="会员昵称" prop="nickName">
<el-date-picker v-model="queryParams.payTime" <el-input
clearable v-model="queryParams.nickName"
placeholder="请选择支付时间" clearable
type="date" placeholder="请输入会员昵称"
value-format="yyyy-MM-dd"> />
</el-form-item>
<!-- <el-form-item label="支付时间" prop="payTime">-->
<!-- <el-date-picker v-model="queryParams.payTime"-->
<!-- clearable-->
<!-- placeholder="请选择支付时间"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="下单时间">
<el-date-picker
v-model="dateValue"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
range-separator="至"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">--> <!-- <el-form-item label="删除标记：1-删除，0-正常" prop="isDelete">-->
<!-- <el-input--> <!-- <el-input-->
...@@ -129,15 +148,16 @@ ...@@ -129,15 +148,16 @@
<el-table v-loading="loading" :data="secondaryCardOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="secondaryCardOrderList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="id" />--> <!-- <el-table-column label="主键" align="center" prop="id" />-->
<el-table-column align="center" label="订单编号" prop="secondaryCardNo" width="180"/>
<el-table-column align="center" label="用户昵称" prop="nickName"/> <el-table-column align="center" label="用户昵称" prop="nickName"/>
<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="phone" width="160"/> <el-table-column align="center" label="用户手机号" prop="phone" width="110"/>
<el-table-column align="center" label="购买记录编号" prop="secondaryCardNo" width="180"/>
<el-table-column align="center" label="扫呗平台唯一订单号" prop="outTradeNo" width="210"/> <!-- <el-table-column align="center" label="扫呗平台唯一订单号" prop="outTradeNo" width="210"/>-->
<!-- <el-table-column label="商户订单号" align="center" prop="terminalTrace" />--> <!-- <el-table-column label="商户订单号" align="center" prop="terminalTrace" />-->
<el-table-column align="center" label="购买金额" prop="secondaryCardAmount"/> <el-table-column align="center" label="购买金额" prop="secondaryCardAmount"/>
<el-table-column align="center" label="次卡名称" prop="confName"/> <el-table-column align="center" label="次卡名称" prop="confName"/>
...@@ -147,13 +167,23 @@ ...@@ -147,13 +167,23 @@
<!-- <el-table-column label="次卡配置表id" align="center" prop="secondaryCardConfId" />--> <!-- <el-table-column label="次卡配置表id" align="center" prop="secondaryCardConfId" />-->
<!-- <el-table-column label="次卡用户ID" align="center" prop="consumerId" />--> <!-- <el-table-column label="次卡用户ID" align="center" prop="consumerId" />-->
<el-table-column align="center" label="支付方式" prop="payType"/> <!-- <el-table-column align="center" label="支付方式" prop="payType"/>-->
<el-table-column align="center" label="支付类型" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payType"/>
</template>
</el-table-column>
<!-- <el-table-column label="状态：0-待支付，1-支付成功，2-退款中，3-退款完成" align="center" prop="payStatus" />--> <!-- <el-table-column label="状态：0-待支付，1-支付成功，2-退款中，3-退款完成" align="center" prop="payStatus" />-->
<el-table-column align="center" label="订单状态" prop="payStatus"> <el-table-column align="center" label="订单状态" prop="payStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/> <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下单时间" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="支付时间" prop="payTime" width="180"> <el-table-column align="center" label="支付时间" prop="payTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
...@@ -247,7 +277,7 @@ import { ...@@ -247,7 +277,7 @@ import {
export default { export default {
name: "SecondaryCardOrder", name: "SecondaryCardOrder",
dicts: ['order_pay_status'], dicts: ['order_pay_status', 'store_pay_ways'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -268,6 +298,7 @@ export default { ...@@ -268,6 +298,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateValue: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -319,6 +350,13 @@ export default { ...@@ -319,6 +350,13 @@ export default {
/** 查询次卡购买记录列表 */ /** 查询次卡购买记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.dateValue && this.dateValue.length > 0) {
this.queryParams.startDate = this.dateValue[0];
this.queryParams.endDate = this.dateValue[1];
} else {
this.queryParams.startDate = null;
this.queryParams.endDate = null;
}
listSecondaryCardOrder(this.queryParams).then(response => { listSecondaryCardOrder(this.queryParams).then(response => {
this.secondaryCardOrderList = response.rows; this.secondaryCardOrderList = response.rows;
this.total = response.total; this.total = response.total;
...@@ -361,6 +399,7 @@ export default { ...@@ -361,6 +399,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.dateValue = null;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
......
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