10.25
This commit is contained in:
parent
130e8556ac
commit
bd5bba3198
@ -14,41 +14,46 @@
|
||||
</div>
|
||||
<el-table :data="tableData" align="center" style="width: 100%">
|
||||
<el-table-column label="序号" type="index" align="center"> </el-table-column>
|
||||
<el-table-column prop="groupOriented" label="电子储值卡活动适配对象" align="center" width="165">
|
||||
<el-table-column prop="groupOriented" label="活动名称" align="center" width="165">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.groupOriented == 1">普通群体</span>
|
||||
<span v-if="scope.row.groupOriented == 2">等级会员</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动信息" align="center">
|
||||
<el-table-column prop="rechargeBalance" label="充值金额" align="center" > </el-table-column>
|
||||
<el-table-column prop="giftBalance" label="赠送金额" align="center" > </el-table-column>
|
||||
<el-table-column prop="points" label="赠送积分" align="center" > </el-table-column>
|
||||
<el-table-column prop="growthValue" label="赠送成长值" align="center" > </el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createBy" label="会员等级" align="center"> </el-table-column>
|
||||
<el-table-column prop="createBy" label="充值金额" align="center"> </el-table-column>
|
||||
<el-table-column prop="createBy" label="赠送金额" align="center"> </el-table-column>
|
||||
<el-table-column prop="createBy" label="赠送积分" align="center"> </el-table-column>
|
||||
<el-table-column prop="createBy" label="赠送成长值" align="center"> </el-table-column>
|
||||
<!-- <el-table-column label="活动信息" align="center">-->
|
||||
<!-- <el-table-column prop="rechargeBalance" label="充值金额" align="center" > </el-table-column>-->
|
||||
<!-- <el-table-column prop="giftBalance" label="赠送金额" align="center" > </el-table-column>-->
|
||||
<!-- <el-table-column prop="points" label="赠送积分" align="center" > </el-table-column>-->
|
||||
<!-- <el-table-column prop="growthValue" label="赠送成长值" align="center" > </el-table-column>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="startTime" label="活动时间" align="center" width="165">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.activeTime == 1">不限时间</span>
|
||||
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="activeStatus" label="活动状态" align="center" >
|
||||
|
||||
<el-table-column prop="activityProgress" label="活动状态" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<!-- <span v-if="scope.row.activeStatus == 0"> <el-tag>未开始</el-tag></span>-->
|
||||
<span v-if="scope.row.activeStatus == 1"> <el-tag>进行中</el-tag></span>
|
||||
<span v-if="scope.row.activeStatus == 2"> <el-tag type="danger">已结束</el-tag></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="activityProgress" label="上架/下架" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isonline == 0"> <el-tag>上架</el-tag></span>
|
||||
<span v-if="scope.row.isonline == 1"> <el-tag>下架</el-tag></span>
|
||||
<span v-if="scope.row.isonline == 0"> <el-tag>已上架</el-tag></span>
|
||||
<span v-if="scope.row.isonline == 1"> <el-tag>未下架</el-tag></span>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" align="center" width="160"> </el-table-column>
|
||||
<el-table-column label="销售信息" align="center">
|
||||
<el-table-column prop="rechargeBalance" label="充值本金(元)" align="center" > </el-table-column>
|
||||
<el-table-column prop="giftBalance" label="赠送金额(元)" align="center" > </el-table-column>
|
||||
<el-table-column prop="points" label="会员人数" align="center" > </el-table-column>
|
||||
<!-- <el-table-column prop="growthValue" label="赠送成长值" align="center" > </el-table-column>-->
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="createBy" label="操作人" align="center"> </el-table-column>
|
||||
|
||||
<el-table-column prop="createTime" label="创建时间" align="center" width="160"> </el-table-column>
|
||||
<el-table-column prop="date" label="操作" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -168,71 +173,59 @@
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
||||
<el-drawer
|
||||
title="新增/修改储值卡活动"
|
||||
<el-dialog
|
||||
:title="titles"
|
||||
:visible.sync="dialog"
|
||||
size="50%"
|
||||
width="50%"
|
||||
ref="drawer"
|
||||
>
|
||||
<div class="demo-drawer__content">
|
||||
<el-form :model="form" :rules="rules" :inline="true" :label-position="labelPosition" label-width="100px" >
|
||||
<!-- <div style="display: flex;">-->
|
||||
<!-- <div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>-->
|
||||
|
||||
<!-- <el-form-item label="" prop="groupOriented" :label-width="formLabelWidth" >-->
|
||||
<!-- <el-radio-group v-model="form.groupOriented">-->
|
||||
|
||||
<!-- <el-radio label="1">不限群体</el-radio>-->
|
||||
<!-- <el-radio label="2">会员等级</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div>{{form.membershipLevel}}</div>-->
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="14">
|
||||
<el-form-item label="活动名称" prop="activeName">
|
||||
<el-input style="width: 250px" v-model="form.activeName"></el-input>
|
||||
<el-input style="width: 300px" v-model="form.activeName"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="14">
|
||||
|
||||
<el-form-item label="充值" label-width="" prop="rechargeBalance">
|
||||
<div style="width: 250px">
|
||||
<div style="width: 300px">
|
||||
<el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-form-item label="赠送" label-width="" prop="giftBalance">
|
||||
<div style="width: 250px">
|
||||
|
||||
<el-form-item label="赠送" label-width="" prop="">
|
||||
<div style="width: 300px">
|
||||
<el-input type="number" v-model="form.giftBalance" autocomplete="off">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
|
||||
<div style="width: 250px">
|
||||
|
||||
<el-form-item label="赠送积分" :label-width="formLabelWidth" prop="">
|
||||
<div style="width: 300px">
|
||||
<el-input type="number" v-model="form.points" autocomplete="off">
|
||||
<template slot="append">分</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-form-item label="赠送成长值" :label-width="formLabelWidth" prop="growthValue">
|
||||
<div style="width: 250px">
|
||||
|
||||
|
||||
<el-form-item label="赠送成长值" :label-width="formLabelWidth" prop="">
|
||||
<div style="width: 300px">
|
||||
<el-input type="number" v-model="form.growthValue" autocomplete="off">
|
||||
<template slot="append">成长值</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-radio-group v-model="form.isonline" @input="changeIsOnline">
|
||||
<el-radio label="0">上架</el-radio>
|
||||
<el-radio label="1">下架</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="提成金额" v-if="form.royaltyType == 2" :label-width="formLabelWidth" prop="amountCommission">
|
||||
<el-input v-model="form.amountCommission" autocomplete="off">
|
||||
<template slot="append">元</template>
|
||||
@ -243,46 +236,35 @@
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<div>
|
||||
<el-form-item label="活动时间" :label-width="formLabelWidth" prop="activeTime">
|
||||
<el-radio-group v-model="form.activeTime">
|
||||
<el-radio label="1">不限时间</el-radio>
|
||||
<el-radio label="2">自定义时间</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-form-item label="时间范围" v-if="form.activeTime == 2" :label-width="formLabelWidth" prop="startTime">
|
||||
<el-date-picker
|
||||
v-model="form.startTime"
|
||||
type="datetime"
|
||||
placeholder="开始日期">
|
||||
</el-date-picker>
|
||||
-
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
type="datetime"
|
||||
placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<div>
|
||||
</div>
|
||||
<div>
|
||||
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-radio-group v-model="form.isonline" @input="changeIsOnline">
|
||||
<el-radio label="0">上架</el-radio>
|
||||
<el-radio label="1">下架</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div>
|
||||
<el-form-item label="赠送优惠券" :label-width="formLabelWidth" >
|
||||
<!-- <el-radio-group v-model="form.isonline" @input="changeIsOnline">-->
|
||||
<!-- <el-radio label="0">不赠送</el-radio>-->
|
||||
<!-- <el-radio label="1">赠送</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
|
||||
<div style="display: flex;align-items: center;justify-content: space-between">
|
||||
<el-form-item label="活动时间" :label-width="formLabelWidth" prop="activeTime">
|
||||
<el-radio-group v-model="form.activeTime" >
|
||||
<el-radio label="1">不限时间</el-radio>
|
||||
<el-radio label="2">自定义时间</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="时间范围" v-if="form.activeTime == 2" :label-width="formLabelWidth" prop="startTime" style="margin-right: 45px">
|
||||
<el-date-picker
|
||||
v-model="form.startTime"
|
||||
type="datetime"
|
||||
style="width: 150px"
|
||||
placeholder="开始日期">
|
||||
</el-date-picker>
|
||||
-
|
||||
<el-date-picker
|
||||
v-model="form.endTime"
|
||||
type="datetime"
|
||||
style="width: 150px"
|
||||
placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-form-item label="赠送优惠券" :label-width="formLabelWidth" style="margin-bottom: 0px">
|
||||
<el-button type="primary" style="margin-left: 30px" size="mini" @click="getlistFavorable()" >添加</el-button>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
</el-form>
|
||||
<!-- 选择优惠券-->
|
||||
<div class="xh-box" >
|
||||
@ -371,7 +353,7 @@
|
||||
确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</el-dialog>
|
||||
<!-- 弹窗-->
|
||||
<el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
|
||||
<div style="display: flex;align-items: center; margin-bottom: 20px ">
|
||||
@ -549,6 +531,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1518 弄'
|
||||
}, ],
|
||||
titles:'',
|
||||
labelPosition:'right',
|
||||
pdidlist:[],//判断优惠券id
|
||||
pddhidlist:[],//判断兑换券id
|
||||
@ -563,7 +546,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
|
||||
name:'',
|
||||
status:'1',
|
||||
pageNum: 1,
|
||||
pageSize: 1000,
|
||||
pageSize: 10,
|
||||
},
|
||||
ytotal:0,
|
||||
//请求兑换券列表时的参数
|
||||
@ -577,6 +560,9 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
|
||||
isonline: '0',
|
||||
dialog: false,
|
||||
rules: {
|
||||
startTime: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
],
|
||||
participationNo: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
],
|
||||
@ -869,6 +855,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
|
||||
})
|
||||
},
|
||||
handleUpdate(row) {
|
||||
this.titles = "修改储值卡"
|
||||
let data = {
|
||||
pageNo:1,
|
||||
pageSize:30,
|
||||
@ -917,6 +904,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
|
||||
},
|
||||
addblock(){
|
||||
this.isOnLine = false
|
||||
this.titles = "新增储值卡"
|
||||
this.vipname = []
|
||||
let data = {
|
||||
pageNo:1,
|
||||
|
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="app-containers">
|
||||
<div class="card-box" style="margin-bottom: 20px">
|
||||
<div class="card-boxs" >
|
||||
<div class="top-hang">
|
||||
<div class="d-s">
|
||||
|
||||
@ -8,10 +8,17 @@
|
||||
placeholder="请输入内容"
|
||||
v-model="queryParams.activeName"
|
||||
clearable
|
||||
width="150px"
|
||||
style="width: 200px"
|
||||
>
|
||||
</el-input>
|
||||
|
||||
<el-select v-model="queryParams.status" clearable style="margin-left: 10px" placeholder="请选择关联油品油号">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-select v-model="queryParams.status" clearable style="margin-left: 10px" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
@ -29,112 +36,126 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
border
|
||||
:data="tableData"
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
type="index"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="activeNum"
|
||||
label="活动编号"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="activeName"
|
||||
label="活动名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cardAmount"
|
||||
label="礼品卡面值"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sumNum"
|
||||
label="制卡数量"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sailNum"
|
||||
label="售出数量"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="有效期"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.effectiveTimeStart + '~' + scope.row.effectiveTimeEnd }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="pwdType"
|
||||
label="密码"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pwdType == 0">免密</span>
|
||||
<span v-if="scope.row.pwdType == 1">加密</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="status"
|
||||
label="状态"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0">待上传</span>
|
||||
<span v-if="scope.row.status == 1">待加密</span>
|
||||
<span v-if="scope.row.status == 2">生效中</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="createBy"-->
|
||||
<!-- label="创建人"-->
|
||||
<!-- >-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="操作">
|
||||
<template slot-scope="scope">
|
||||
<div style="display: flex;flex-wrap: wrap">
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 0"
|
||||
@click="updateId(scope.row)"
|
||||
>修改
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 0 || scope.row.status == 1"
|
||||
@click="uploadShow(scope.row)"
|
||||
>上传礼品卡数据
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 1"
|
||||
@click="jmData(scope.row.id)"
|
||||
>一键加密
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 2"
|
||||
@click="downData(scope.row.id)"
|
||||
>下载
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status ==2"
|
||||
@click="orderShow =! orderShow"
|
||||
>查看订单信息
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<div class="table-box">
|
||||
<el-table
|
||||
border
|
||||
:data="tableData"
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
type="index"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="activeNum"
|
||||
label="活动编号"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="activeName"
|
||||
label="活动名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cardAmount"
|
||||
label="礼品卡面值(元)"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sumNum"
|
||||
label="制卡数量"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sumNum"
|
||||
label="剩余礼品卡数量"
|
||||
>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="sailNum"-->
|
||||
<!-- label="售出数量"-->
|
||||
<!-- >-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="有效期"
|
||||
width="240px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.effectiveTimeStart + '~' + scope.row.effectiveTimeEnd }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sumNum"
|
||||
label="关联油品油号"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="pwdType"
|
||||
label="密码"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pwdType == 0">免密</span>
|
||||
<span v-if="scope.row.pwdType == 1">加密</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="status"
|
||||
label="状态"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status == 0">待上传</span>
|
||||
<span v-if="scope.row.status == 1">待加密</span>
|
||||
<span v-if="scope.row.status == 2">生效中</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createBy"
|
||||
label="创建人"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="操作">
|
||||
<template slot-scope="scope">
|
||||
<div style="display: flex;flex-wrap: wrap">
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 0"
|
||||
@click="updateId(scope.row)"
|
||||
>修改
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 0 || scope.row.status == 1"
|
||||
@click="uploadShow(scope.row)"
|
||||
>上传礼品卡数据
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 1"
|
||||
@click="jmData(scope.row.id)"
|
||||
>一键加密
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status == 2"
|
||||
@click="downData(scope.row.id)"
|
||||
>下载
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
v-if="scope.row.status ==2"
|
||||
@click="orderShow =! orderShow"
|
||||
>查看订单信息
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
@ -771,7 +792,12 @@ export default {
|
||||
margin-bottom: 10px;
|
||||
|
||||
}
|
||||
|
||||
.table-box{
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
overflow: auto;
|
||||
//padding: 15px;
|
||||
}
|
||||
.d-b {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -877,9 +903,9 @@ export default {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.card-box {
|
||||
.card-boxs {
|
||||
width: 100%;
|
||||
height: 800px;
|
||||
height: 85vh;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div class="app-containers">
|
||||
<div class="containers_app">
|
||||
<!-- 优惠券 -->
|
||||
|
||||
<div class="card-box" style="margin-bottom: 20px">
|
||||
<div class="card-boxs" >
|
||||
|
||||
<div class="top-hang">
|
||||
<div class="d-s">
|
||||
@ -25,7 +25,7 @@
|
||||
<el-button type="primary" @click="addCertificate">新增优惠券</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 69vh;overflow: auto">
|
||||
<div style="height: 71vh;overflow: auto">
|
||||
<el-table border :data="tableData" style="width: 100%">
|
||||
<el-table-column label="序号" type="index"></el-table-column>
|
||||
<el-table-column prop="number" label="优惠券编号"></el-table-column>
|
||||
@ -289,9 +289,7 @@
|
||||
style="width: 80px;margin: 0px 10px"></el-input>
|
||||
<span>天内有效</span></el-radio>
|
||||
<el-radio :label="'2'">指定使用日期</el-radio>
|
||||
|
||||
</el-radio-group>
|
||||
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
@ -306,11 +304,7 @@
|
||||
:label="item.name"
|
||||
:value="item.id+''"></el-option>
|
||||
</el-select>
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<!-- 生效日期 effectiveDateStart 字段 -->
|
||||
<el-form-item label="生效日期" required style="width: 50%;" v-if="ruleForm.timeType=='2'"
|
||||
prop="effectiveDateStart">
|
||||
@ -1356,7 +1350,9 @@ export default {
|
||||
justify-content: space-between;
|
||||
|
||||
}
|
||||
.containers_app{
|
||||
|
||||
}
|
||||
.box-der {
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
@ -1474,7 +1470,7 @@ export default {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.card-box {
|
||||
.card-boxs {
|
||||
width: 100%;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
|
@ -1,42 +1,7 @@
|
||||
<template>
|
||||
<div class="app-containers">
|
||||
<!-- 存油卡-->
|
||||
<!-- <el-card style="margin-bottom: 20px">-->
|
||||
<!-- <div style="display: flex;align-items: center;justify-content: space-between">-->
|
||||
<!-- <el-breadcrumb separator="/" style="margin-right: 35px">-->
|
||||
<!-- <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>-->
|
||||
<!-- <el-breadcrumb-item :to="{ path: '/EventMarketing/CardHolder/index' }" >电子卡券管理</el-breadcrumb-item>-->
|
||||
<!-- <el-breadcrumb-item>电子囤油卡</el-breadcrumb-item>-->
|
||||
<!-- </el-breadcrumb>-->
|
||||
<!-- <el-radio-group v-model="queryParams.type" @input="radiovalue(dict.label)">-->
|
||||
<!-- <el-radio-button v-for="dict in dict.type.oil_type"-->
|
||||
<!-- :key="dict.value"-->
|
||||
<!-- :label="dict.label"-->
|
||||
<!-- :value="dict.value"-->
|
||||
<!-- ></el-radio-button>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="top-sousuo">-->
|
||||
<!-- <el-select v-model="queryParams.oilType" clearable placeholder="请选择油号">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="dict in oilList"-->
|
||||
<!-- :key="dict.id"-->
|
||||
<!-- :label="dict.oilName"-->
|
||||
<!-- :value="dict.id">-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- <el-select v-model="queryParams.activeStatus" placeholder="状态" style="margin:0px 20px">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in option"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- :value="item.value">-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- <el-button type="primary" style="margin-left: 20px ;float: right" icon="el-icon-search" @click="getlist">搜索</el-button>-->
|
||||
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-card>-->
|
||||
|
||||
<div class="card-box" style="margin-bottom: 20px">
|
||||
<div class="d-s">
|
||||
<div class="gang"></div>
|
||||
@ -54,6 +19,7 @@
|
||||
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
@ -63,7 +29,7 @@
|
||||
|
||||
<el-table-column
|
||||
prop="type"
|
||||
label="油品信息"
|
||||
label="油品油号"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@ -81,62 +47,52 @@
|
||||
label="当前国标价(元)/L"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="type"
|
||||
label="活动时间"
|
||||
width="330"
|
||||
>
|
||||
<!-- <template slot-scope="scope" v-if="scope.row.activeTime==='2'">-->
|
||||
<el-table-column prop="startTime" label="活动时间" align="center" width="165">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.activeTime==='2'" style="display: flex;align-items: center">
|
||||
<div>{{scope.row.createTime}}</div>
|
||||
<div> --- </div>
|
||||
<div>{{scope.row.endTime}}</div>
|
||||
</div>
|
||||
<div v-if="scope.row.activeTime==='1'" style="display: flex;align-items: center"><div>不限时间</div></div>
|
||||
<span v-if="scope.row.activeTime == 1">不限时间</span>
|
||||
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
prop="activeStatus"
|
||||
label="活动状态"
|
||||
>
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.activeStatus == 0"> <el-tag>已上架</el-tag></span>
|
||||
<span v-if="scope.row.activeStatus == 1"> <el-tag>未下架</el-tag></span>
|
||||
|
||||
|
||||
<el-switch
|
||||
v-model="scope.row.activeStatus"
|
||||
active-value="1"
|
||||
inactive-value="2"
|
||||
active-color="#fe8c4a"
|
||||
inactive-color="#909399"
|
||||
@change="posteid(scope.row)"
|
||||
>
|
||||
</el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="销售信息" align="center">
|
||||
<el-table-column prop="rechargeBalance" label="售出金额(元)" align="center" > </el-table-column>
|
||||
<el-table-column prop="giftBalance" label="售出人数" align="center" > </el-table-column>
|
||||
<el-table-column prop="points" label="会员人数" align="center" > </el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createBy" label="操作人" align="center"> </el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" align="center" width="160"> </el-table-column>
|
||||
|
||||
|
||||
|
||||
<el-table-column
|
||||
label="编辑"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
<div style="display: flex">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="lookorder()"
|
||||
>查看订单记录
|
||||
</el-button>
|
||||
</div>
|
||||
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- >删除-->
|
||||
<!-- </el-button>-->
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="lookorder()"
|
||||
>查看订单记录
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
@ -231,8 +187,8 @@
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 规则-->
|
||||
<el-dialog title="编辑囤油卡规则" :visible.sync="Crule">
|
||||
<el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="100px" class="demo-ruleForm" >
|
||||
<el-dialog title="编辑囤油卡规则" width="30%" :visible.sync="Crule">
|
||||
<el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="70px" class="demo-ruleForm" >
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input disabled v-model="oilForm.name"></el-input>
|
||||
</el-form-item>
|
||||
@ -243,7 +199,7 @@
|
||||
<el-input type="textarea" v-model="oilForm.gzDetail"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-form-item >
|
||||
<el-button type="primary" @click="submitForms('oilForm')">保存</el-button>
|
||||
<el-button @click="resetForm('oilForm')">取消</el-button>
|
||||
</el-form-item>
|
||||
@ -253,13 +209,13 @@
|
||||
<el-dialog
|
||||
title="囤油卡操作"
|
||||
:visible.sync="centerDialogVisible"
|
||||
width="36%"
|
||||
width="30%"
|
||||
center>
|
||||
|
||||
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
|
||||
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
|
||||
<div style="display: flex; align-items: center ">
|
||||
<el-form-item label="油品油号" prop="oilNumberId">
|
||||
<el-select v-model="ruleForm.oilNumberId" placeholder="请选择" @change="getoiltype" >
|
||||
<el-select style="width: 440px" v-model="ruleForm.oilNumberId" placeholder="请选择" @change="getoiltype" >
|
||||
<el-option
|
||||
v-for="dict in oilList"
|
||||
:key="dict.id"
|
||||
@ -271,21 +227,21 @@
|
||||
|
||||
</div>
|
||||
<el-form-item label="充值金额" prop="rechargeBalance">
|
||||
<div style="width: 217px">
|
||||
<div style="width: 100%">
|
||||
<el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入充值金额">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="锁定单价" prop="lockPrice">
|
||||
<div style="width: 217px">
|
||||
<div style="width: 100%">
|
||||
<el-input v-model="ruleForm.lockPrice" min="1" placeholder="请输入锁定单价">
|
||||
<template slot="append">元/升</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="赠送积分" prop="points">
|
||||
<div style="width: 217px">
|
||||
<div style="width: 100%">
|
||||
<el-input v-model="ruleForm.points">
|
||||
<template slot="append">分</template>
|
||||
</el-input>
|
||||
@ -299,7 +255,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="时间范围" v-if="ruleForm.activeTime == 2" prop="startTime">
|
||||
<div style="width: 100%;display: flex;align-items: center ">
|
||||
<div style="width: 217px">
|
||||
<div style="width: 200px">
|
||||
<el-date-picker
|
||||
v-model="ruleForm.startTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
@ -307,10 +263,10 @@
|
||||
placeholder="开始日期">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="width: 5%">
|
||||
<div style="margin: 0 5px">
|
||||
-
|
||||
</div>
|
||||
<div style="width: 45%">
|
||||
<div style="width: 200px">
|
||||
<el-date-picker
|
||||
v-model="ruleForm.endTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
|
Loading…
Reference in New Issue
Block a user