Commit 9ab92a54 authored by denghr's avatar denghr

优惠券管理

parent 26c06675
...@@ -479,6 +479,12 @@ export const asyncRouterMap = [{ ...@@ -479,6 +479,12 @@ export const asyncRouterMap = [{
component: _import('cunponManagements/cunponManagement'), component: _import('cunponManagements/cunponManagement'),
name: '优惠券管理', name: '优惠券管理',
authority: 'cunponManagement' authority: 'cunponManagement'
},
{
path: 'conponList',
component: _import('cunponManagements/conponList'),
name: '优惠券列表',
authority: 'conponList'
} }
] ]
} }
......
<template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div>
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
<el-row>
<el-col :span="4">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="">
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="金额">
<el-input v-model.number="listQuery.phone" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="">
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
</el-form>
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;">
<el-table-column type="index" align="center" label="姓名" width="200">
<template scope="scope">
<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="手机号">
<template scope="scope">
<span>{{scope.row.phone}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="金额">
<template scope="scope">
<span>{{scope.row.amount}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态">
<template scope="scope">
<span v-if="scope.row.stauts==0">未到帐</span>
<span v-if="scope.row.stauts==1">已到账</span>
</template>
</el-table-column>
<el-table-column align="center" label="申请时间">
<template scope="scope">
<span>{{scope.row.crtTimeStr}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="到账时间">
<template scope="scope">
<span>{{scope.row.finishTimeStr}}</span>
</template>
</el-table-column>
</el-table>
<div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
</div>
</div>
</template>
<script>
import {
formatDate
} from 'utils/dateFormattor';
import {
toEast8Date,
deepCopyDate,
newEast8Date,
convertDate2Str,
timestamp2Date
} from 'utils/dateUtils';
import rsCode from '../../utils/rsCode';
import {mapGetters} from 'vuex';
import {
getToken
} from 'utils/auth';
import {
discountList
} from 'api/purseManage';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col";
export default {
name: 'conponList',
components: {
ElCol,
ElRow,
Element1,
},
data() {
return {
typeOptions: [
{
"name":'全部',
"val":''
},
{
"name":'未到账',
"val":'0'
},
{
"name":'已到账',
"val":'1'
},
],
BASE_API: process.env.BASE_API,
showLoadingBody: false,
list: null,
total: null,
listLoading: true,
listQuery: {
page: 1,
limit: 20,
phone: '',//手机号
username: '',//姓名
state:'',//状态
},
inline: true,
tableKey: 0
}
},
created() {
this.getList();
},
computed: {
...mapGetters([
'elements'
])
},
methods: {
/**
* 获取提现列表
* */
getList() {
this.listLoading = true;
discountList(this.listQuery).then(response => {
let totalCountRs = undefined;
let listRs = undefined;
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
listRs = response.data.data;
totalCountRs = response.data.totalCount;
listRs.map(function(item){
item.crtTimeStr = timestamp2Date(item.crtTime);
item.finishTimeStr = timestamp2Date(item.finishTime);
});
}
this.listLoading = false;
this.list = listRs;
this.total = totalCountRs;
})
},
handleFilter() {
this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList();
} else {
return false;
}
});
},
handleSizeChange(val) {
this.listQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
}
}
}
</script>
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div> <div>
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="50px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="5">
<el-form-item label="标题"> <el-form-item label="标题">
<el-input v-model.number="listQuery.title" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.title" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="5">
<el-form-item label="状态" prop="type"> <el-form-item>
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态"> <el-select class="filter-item" v-model="listQuery.state" placeholder="类型">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option> <el-option v-for="(item,index) in channelType" :key="index" :label="item.name" :value="item.val"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -21,40 +21,43 @@ ...@@ -21,40 +21,43 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row style="width: 100%;">
style="width: 100%;"> <el-table-column type="index" align="center" label="ID" width="100">
<el-table-column type="index" width="100" align="center" label="ID">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="优惠券标题">
<el-table-column width="200" align="center" label="优惠券标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{scope.row.title}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="类型">
<el-table-column width="200" align="center" label="已领取"> <template scope="scope">
<span v-if="scope.row.channel==0">全平台</span>
<span v-if="scope.row.channel==1">租车</span>
<span v-if="scope.row.channel==2">旅游</span>
<span v-if="scope.row.channel==3">营地</span>
</template>
</el-table-column>
<el-table-column align="center" label="已领取">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.get}}</span> <span>{{scope.row.get}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="已使用">
<el-table-column width="200" align="center" label="已使用">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.used}}</span> <span>{{scope.row.used}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="申请时间">
<el-table-column width="200" align="center" label="申请时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.time}}</span> <span>{{scope.row.time}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="操作"> <el-table-column align="center" label="操作">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-popover <el-popover
ref="popover1" ref="popover1"
placement="top" placement="top"
...@@ -78,63 +81,81 @@ ...@@ -78,63 +81,81 @@
</div> </div>
<!-- 优惠券编辑 --> <!-- 优惠券编辑 -->
<el-dialog title="优惠券编辑" :visible.sync="editDialogVisible"> <el-dialog :title="modalTitle" :visible.sync="editDialogVisible">
<el-form :model="formdata" :rules="rules" ref="form" label-width="90px"> <el-form :model="formdata" :rules="rules" ref="form" label-width="110px">
<div style="font-weight: bold;">基础设置</div> <div style="font-weight: bold;">基础设置</div>
<hr style="background-color:#e5e5e5;height:1px;border:none;margin:10px 0"> <hr style="background-color:#e5e5e5;height:1px;border:none;margin:10px 0">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="优惠券标题" prop="name"> <el-form-item label="优惠券标题" prop="title">
<el-input v-model="formdata.title" placeholder="请输入优惠券标题"></el-input> <el-input v-model="formdata.title" placeholder="请输入优惠券标题" :disabled="isUpdate"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用人群"> <el-form-item label="适用人群">
<el-radio-group v-model="formdata.user_type_name" size="medium">
<el-radio-button label="普通用户" :disabled="formdata.user_type_name=='会员用户'&&isUpdate"></el-radio-button>
<el-radio-button label="会员用户" :disabled="formdata.user_type_name=='普通用户'&&isUpdate"></el-radio-button>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="优惠金额" prop="name"> <el-form-item label="优惠金额">
<el-input v-model="formdata.title" placeholder="请输入优惠金额"></el-input> <el-input v-model="formdata.used_amount" placeholder="请输入优惠金额" :disabled="isUpdate"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="优惠方式"> <el-form-item label="优惠方式">
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择" style="width:100px"> <el-select class="filter-item" v-model="formdata.type" placeholder="请选择" style="width:110px" :disabled="isUpdate">
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val" <el-option :label="formdata.typeName" :value="formdata.type"></el-option>
:value="item.id"></el-option> <el-option v-for="(item,index) in cunponType " :key="index" :label="item.val"
:value="item.id" :disabled="item.id==2"></el-option>
</el-select> </el-select>
<span></span> <span v-if="formdata.type==1"></span>
<el-input v-model="formdata.title" placeholder="请输入金额" style="width:50px"></el-input> <el-input v-model="formdata.title" placeholder="请输入金额" style="width:100px" v-if="formdata.type==1" :disabled="isUpdate"></el-input>
<span>可用</span> <span v-if="formdata.type==1">可用</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期" prop="name"> <el-form-item label="有效期">
<span>领取后</span> <el-radio-group v-model="formdata.valid_type_name" size="medium">
<el-input v-model="formdata.title" placeholder="请输入金额" style="width:50px"></el-input> <el-radio-button label="绝对时效" :disabled="formdata.valid_type_name=='相对时效'&&isUpdate"></el-radio-button>
<span>天有效</span> <el-radio-button label="相对时效" :disabled="formdata.valid_type_name=='绝对时效'&&isUpdate"></el-radio-button>
</el-radio-group>
<div style="display:inline-block" v-show="formdata.valid_type_name=='绝对时效'">
<el-date-picker v-model="formdata.validStartTimeStr" type = "date" placeholder = "开始时间" :disabled="isUpdate"></el-date-picker>
<span> - </span>
<el-date-picker v-model="formdata.validEndTimeStr" type = "date" placeholder = "结束时间" :disabled="isUpdate"></el-date-picker>
</div>
<div style="display:inline-block" v-show="formdata.valid_type_name=='相对时效'">
<span>领取后</span>
<el-input v-model="formdata.valid_days" placeholder="请输入金额" style="width:100px" :disabled="isUpdate"></el-input>
<span>天有效</span>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否可转赠" prop="name"> <el-form-item label="是否可转赠">
<el-radio-group v-model="formdata.cangive" size="medium">
<el-radio-button label="是" disabled=""></el-radio-button>
<el-radio-button label="否" ></el-radio-button>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="跳转链接"> <el-form-item label="跳转链接">
<el-input v-model="formdata.title" placeholder="请输入跳转链接"></el-input> <el-input v-model="formdata.url" placeholder="请输入跳转链接"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="图标" :style="{display:'block'}"> <el-form-item label="优惠券图片" :style="{display:'block'}">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
:headers="getHeaderWithToken" :headers="getHeaderWithToken"
...@@ -142,11 +163,9 @@ ...@@ -142,11 +163,9 @@
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
list-type="picture"> list-type="picture">
<!--<img v-if="$utils.isString(add.icon) && !$utils.isEmpty(add.icon)" :src="add.icon" <img v-if="$utils.isString(formdata.icon) && !$utils.isEmpty(formdata.icon)" :src="formdata.icon"
style="width:300px;max-height:300px;">--> style="width:300px;max-height: 100px;">
<!--<i v-else class="el-icon-plus avatar-uploader-icon" <i v-else class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>-->
<i class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -155,9 +174,10 @@ ...@@ -155,9 +174,10 @@
<hr style="background-color:#e5e5e5;height:1px;border:none;margin:10px 0"> <hr style="background-color:#e5e5e5;height:1px;border:none;margin:10px 0">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="优惠券类别" prop="name"> <el-form-item label="优惠券类别" >
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择"> <el-select class="filter-item" v-model="formdata.used" placeholder="请选择" :disabled="isUpdate">
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val" <el-option :label="formdata.usedName" :value="formdata.used"></el-option>
<el-option v-for="(item,index) in usedType " :key="index" :label="item.val"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -165,9 +185,10 @@ ...@@ -165,9 +185,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="适用范围" prop="name"> <el-form-item label="适用范围" >
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择"> <el-select class="filter-item" v-model="formdata.channel" placeholder="请选择" :disabled="isUpdate">
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val" <el-option :label="formdata.channelName" :value="formdata.channel"></el-option>
<el-option v-for="(item,index) in channelType " :key="index" :label="item.val"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -175,51 +196,56 @@ ...@@ -175,51 +196,56 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="开始发放时间" prop="name"> <el-form-item label="开始发放时间" >
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择"> <el-radio-group v-model="formdata.startTimeName" size="medium">
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val" <el-radio-button label="不限"></el-radio-button>
:value="item.id"></el-option> <el-radio-button label="自定义" ></el-radio-button>
</el-select> </el-radio-group>
<div style="display:inline-block" v-show="formdata.startTimeName=='自定义'">
<el-date-picker v-model="formdata.startTimeStr" type = "date" placeholder = "开始发放时间" :picker-options="pickerOptionsStart"></el-date-picker>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="结束发放时间" prop="name"> <el-form-item label="结束发放时间" >
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择"> <el-radio-group v-model="formdata.endTimeName" size="medium">
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val" <el-radio-button label="不限"></el-radio-button>
:value="item.id"></el-option> <el-radio-button label="自定义" ></el-radio-button>
</el-select> </el-radio-group>
<div style="display:inline-block" v-show="formdata.endTimeName=='自定义'">
<el-date-picker v-model="formdata.endTimeStr" type = "date" placeholder = "结束发放时间" :picker-options="pickerOptionsEnd"></el-date-picker>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="最多发放数量" prop="name"> <el-form-item label="最多发放数量" >
<el-select class="filter-item" v-model="formdata.endDate" placeholder="请选择"> <el-input v-model="formdata.quota" placeholder="请输入最多发放数量"></el-input>
<el-option v-for="(item,index) in cunponType " :key="item.id" :label="item.val"
:value="item.id"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="每人限领次数" prop="name"> <el-form-item label="每人限领次数" >
<el-input v-model="formdata.title" placeholder="请输入限领次数"></el-input> <el-input v-model="formdata.limit_collar" placeholder="请输入限领次数"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="">取消</el-button> <el-button @click="cancelHandel">取消</el-button>
<el-button type="primary" @click="">确定</el-button> <el-button v-if="modalTitle=='优惠券添加'" type="primary" @click="create('form')">确 定</el-button>
<el-button v-else type="primary" @click="update('form')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框
import { import {
formatDate formatDate
} from 'utils/dateFormattor'; } from 'utils/dateFormattor';
...@@ -229,7 +255,8 @@ ...@@ -229,7 +255,8 @@
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str, convertDate2Str,
timestamp2Date timestamp2Date,
getymdTimeByDay
} from 'utils/dateUtils'; } from 'utils/dateUtils';
import {mapGetters} from 'vuex'; import {mapGetters} from 'vuex';
...@@ -244,7 +271,7 @@ ...@@ -244,7 +271,7 @@
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
export default { export default {
name: 'discountRecord', name: 'cunponManagement',
components: { components: {
ElCol, ElCol,
ElRow, ElRow,
...@@ -252,25 +279,61 @@ ...@@ -252,25 +279,61 @@
}, },
data() { data() {
return { return {
typeOptions: [ cunponType:[
{
id:'1',
val:'满减卷'
},{
id:'2',
val:'叠加满减卷'
},{
id:'3',
val:'无门槛卷'
}
],
usedType:[
{ {
"name":'类型', id:'10',
"val":'' val:'店铺优惠卷'
}, },
{ {
"name":'未到账', id:'11',
"val":'0' val:'新人店铺卷'
}, },
{ {
"name":'已到账', id:'20',
"val":'1' val:'商品优惠券'
}, },
{
id:'30',
val:'类目优惠券'
},
{
id:'60',
val:'平台优惠券'
},
{
id:'61',
val:'新人平台券'
}
], ],
cunponType:[ channelType:[
{ {
id:'1', id:'0',
val:'满减' val:'全平台'
} },
{
id:'1',
val:'租车'
},
{
id:'2',
val:'旅游'
},
{
id:'3',
val:'营地'
}
], ],
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
...@@ -281,38 +344,59 @@ ...@@ -281,38 +344,59 @@
page: 1, page: 1,
limit: 20, limit: 20,
title: '',//手机号 title: '',//手机号
state:'',//状态 state:undefined,//状态
}, },
inline: true, inline: true,
tableKey: 0, tableKey: 0,
editDialogVisible:false, editDialogVisible:false,
formdata:{}, formdata:{},
modalTitle:'',
isUpdate:false,
rules:{ rules:{
name: [ title: {
{ type: 'string',
type: 'string', required: true,
required: true, message: '请输入标题',
message: '请输入消息内容', trigger: 'blur'
trigger: 'blur' },
},
{
min: 0,
max: 50,
message: '长度小于50个字符',
trigger: 'blur'
}
],
}, },
list:[ list:[
{ {
"id":'1', id:'1',
"title":"123", title:"123",
"get":'1', get:'1',
"used":'1', used:'10',
"time":'2018-01-01', time:'2018-01-01',
"visible2":false visible2:false,
cover:"",
user_type_name:"普通用户",
type:1,
channel:0,
startTimeStr:'',
endTimeStr:''
} }
] ],
pickerOptionsStart: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
// pickerOptionsStart: {
// disabledDate: time => {
// const endDateVal = new Date(this.formdata.endTimeStr).getTime()
// if (endDateVal) {
// return time.getTime() > endDateVal - 0
// }
// }
// },
pickerOptionsEnd: {
disabledDate: time => {
const beginDateVal = new Date(this.formdata.startTimeStr).getTime()
if (beginDateVal) {
return time.getTime() < beginDateVal - 0
}
}
}
} }
}, },
created() { created() {
...@@ -321,7 +405,10 @@ ...@@ -321,7 +405,10 @@
computed: { computed: {
...mapGetters([ ...mapGetters([
'elements' 'elements'
]) ]),
getHeaderWithToken() {
return {Authorization: getToken()};
},
}, },
methods: { methods: {
/** /**
...@@ -366,17 +453,222 @@ ...@@ -366,17 +453,222 @@
}, },
handleUpdate(item){ handleUpdate(item){
var that = this; var that = this;
that.modalTitle = '优惠券编辑';
that.isUpdate = true;
that.cleanForm();
item.user_type_name = item.userType==0?'普通用户':'会员用户';
item.valid_type_name = item.validType==1?'绝对时效':'相对时效';
if(item.validStartTime!=''){
item.validStartTimeStr = getymdTimeByDay(item.validStartTime);
}else{
item.validStartTimeStr = '';
}
if(item.validEndTime!=''){
item.validEndTimeStr = getymdTimeByDay(item.validEndTime);
}else{
item.validEndTimeStr = '';
}
if(item.startTime>0){
item.startTimeStr = getymdTimeByDay(item.startTime);
}else{
item.startTimeStr = '';
}
if(item.endTime>0){
item.endTimeStr = getymdTimeByDay(item.endTime);
}else{
item.endTimeStr = '';
}
if(item.type==1){
item.typeName = '满减券'
}else if(item.type==3){
item.typeName = '无门槛券'
}
if(item.used ==10){
item.usedName = '店铺优惠券'
}else if(item.used ==11){
item.usedName = '新人店铺券'
}else if(item.used ==20){
item.usedName = '商品优惠券'
}else if(item.used ==30){
item.usedName = '类目优惠券'
}else if(item.used ==60){
item.usedName = '平台优惠券'
}else if(item.used ==61){
item.usedName = '新人平台券'
}
if(item.channel ==0){
item.channelName = '全平台'
}else if(item.channel ==1){
item.channelName = '租车'
}else if(item.channel ==2){
item.channelName = '旅游'
}else if(item.channel ==3){
item.channelName = '营地'
}
item.startTimeName=item.startTime==0?'不限':'自定义';
item.endTimeName=item.endTime==0?'不限':'自定义';
item.cangive='否';
that.formdata = item;
console.log(that.formdata)
that.editDialogVisible = true; that.editDialogVisible = true;
console.log(item)
that.formdata = item
}, },
addCunpon(){ addCunpon(){
var that = this;
that.modalTitle = '优惠券添加';
that.isUpdate = false;
that.cleanForm();
console.log(that.formdata)
that.editDialogVisible = true;
}, },
deleteHandler(item){ deleteHandler(item){
item.visible2 = false item.visible2 = false
}, },
/**
* 创建
* */
create(formName) {
var that = this;
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
if(that.formdata.validStartTimeStr!=''){
that.formdata.validStartTime = this.formdata.validStartTimeStr.getTime();
}else{
that.formdata.validStartTime = ''
}
if(that.formdata.validEndTimeStr!=''){
that.formdata.validEndTime = this.formdata.validEndTimeStr.getTime();
}else{
that.formdata.validEndTime = ''
}
if(that.formdata.startTimeStr!=''){
that.formdata.startTime = this.formdata.startTimeStr.getTime();
}else{
that.formdata.startTime = 0
}
if(that.formdata.endTimeStr!=''){
that.formdata.endTime = this.formdata.endTimeStr.getTime();
}else{
that.formdata.endTime = 0
}
that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1
console.log(that.formdata)
// addBanner(this.form)
// .then(response => {
// if (response.status === 200) {
// this.bannerDialogVisible = false;
// this.getList();
// this.$notify({
// title: '成功',
// message: '创建成功',
// type: 'success',
// duration: 2000
// });
// this.getList();
// } else {
// this.$notify({
// title: '失败',
// message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败!',
// type: 'error',
// duration: 2000
// });
// }
// });
} else {
return false;
}
});
},
/**
* 编辑-更新
* */
update(formName) {
const set = this.$refs;
// set[formName].validate(valid => {
// if (valid) {
// editBanner(this.form).then(response => {
// if (response.status === 200) {
// this.bannerDialogVisible = false;
// this.getList();
// this.$notify({
// title: '成功',
// message: '编辑成功',
// type: 'success',
// duration: 2000
// });
// this.getList();
// } else {
// this.$notify({
// title: '失败',
// message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败!',
// type: 'error',
// duration: 2000
// });
// }
// });
// } else {
// return false;
// }
// });
},
/**
* 上传图片
* @param file
* @returns {boolean}
*/
beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg' || file.type === 'image/gif';
const isLt2M = file.size / 1024 / 1024 < 10;
if (!isJPG) {
this.$message.error('上传图片只能是 JPG/GIF 格式!');
}
if (!isLt2M) {
this.$message.error('上传图片大小不能超过 10MB!');
}
this.showLoadingBody = true;
return isJPG && isLt2M;
},
handleAvatarSuccess(res, file) {
this.formdata.icon = res.data;
this.showLoadingBody = false;
},
/**
* 弹框-取消
* */
cancelHandel(){
this.cleanForm();
this.editDialogVisible = false;
},
/**
* 清空表单
* */
cleanForm() {
this.formdata = {
title: '',
user_type_name:"普通用户",
type:'',
valid_type_name:'绝对时效',
startTime:'',
endTime:'',
cangive:'否',
url:'',
icon:'',
used:'',
channel:'',
startTimeName:'不限',
endTimeName:'不限',
validStartTimeStr:'',
validEndTimeStr:'',
startTimeStr:'',
endTimeStr:'',
}
},
} }
} }
</script> </script>
......
...@@ -4,59 +4,59 @@ ...@@ -4,59 +4,59 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="状态" prop="type"> <el-form-item label="状态" prop="type">
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态"> <el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option> <el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;"> style="width: 100%;">
<el-table-column type="index" width="150" align="center" label="姓名"> <el-table-column type="index" align="center" label="姓名" width="200">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.username}}</span> <span>{{scope.row.username}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="手机号"> <el-table-column align="center" label="手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.phone}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="金额"> <el-table-column align="center" label="金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.amount}}</span> <span>{{scope.row.amount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="状态"> <el-table-column align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.stauts==0">未到帐</span> <span v-if="scope.row.stauts==0">未到帐</span>
<span v-if="scope.row.stauts==1">已到账</span> <span v-if="scope.row.stauts==1">已到账</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="申请时间"> <el-table-column align="center" label="申请时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="到账时间"> <el-table-column align="center" label="到账时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.finishTimeStr}}</span> <span>{{scope.row.finishTimeStr}}</span>
</template> </template>
......
...@@ -4,26 +4,26 @@ ...@@ -4,26 +4,26 @@
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="流水类型" prop="type"> <el-form-item label="流水类型" prop="type">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型"> <el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option> <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;"> style="width: 100%;">
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="姓名"> <el-table-column width="200" align="center" label="姓名">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.username}}</span> <span>{{scope.row.username}}</span>
</template> </template>
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
<span>{{scope.row.cono}}</span> <span>{{scope.row.cono}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="订单金额"> <el-table-column width="200" align="center" label="订单金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.price}}</span> <span>{{scope.row.price}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="提成比例"> <el-table-column width="200" align="center" label="提成比例">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.extract}}%</span> <span>{{scope.row.extract}}%</span>
</template> </template>
......
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;"> style="width: 100%;">
<el-table-column width="150" align="center" label="姓名" type="index"> <el-table-column width="250" align="center" label="姓名" type="index">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.username}}</span> <span>{{scope.row.username}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="手机号"> <el-table-column width="250" align="center" label="手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.phone}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
......
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