dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.6

Browse Source
This commit is contained in:
user 2023-11-06 10:31:30 +08:00
parent 6a815ef61b
commit a0f9d68658
4 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/api/EventMarketing/SaveBlock.js
View File

@ -16,6 +16,14 @@ export function addList(data) {
data: data data: data
}) })
} }
export function listUserGrade(data) {
return request({
url: '/business/userManager/userGrade/list',
method: 'get',
params: data
})
}
// 修改列表 // 修改列表
export function eitList(data) { export function eitList(data) {
return request({ return request({

28
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -21,9 +21,7 @@
<el-table <el-table
:data="tableData" :data="tableData"
align="center" align="center"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="groupOriented" prop="groupOriented"
label="面向群体" label="面向群体"
@ -173,10 +171,15 @@
<el-form :model="form" :rules="rules" :inline="true" > <el-form :model="form" :rules="rules" :inline="true" >
<el-form-item label="面向群体" :label-width="formLabelWidth"> <el-form-item label="面向群体" :label-width="formLabelWidth">
<el-radio-group v-model="form.groupOriented"> <el-radio-group v-model="form.groupOriented">
<el-radio :label="1">不限群体</el-radio> <el-radio label="1">不限群体</el-radio>
<el-radio :label="2">会员等级</el-radio> <el-radio label="2">会员等级</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="会员等级" prop="region" v-if="form.groupOriented == '2' " >
<el-select v-model="form.membershipLevel" placeholder="请选择会员等级" >
<el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance"> <el-form-item label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
<el-input v-model="form.rechargeBalance" autocomplete="off"> <el-input v-model="form.rechargeBalance" autocomplete="off">
<template slot="append">元</template> <template slot="append">元</template>
@ -331,7 +334,7 @@
</template> </template>
<script> <script>
import { getList,addList,eitList,deleteList } from "@/api/EventMarketing/SaveBlock"; import { getList,addList,eitList,deleteList,listUserGrade } from "@/api/EventMarketing/SaveBlock";
export default { export default {
name: 'index', name: 'index',
data(){ data(){
@ -345,6 +348,7 @@
name: [ name: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
refuelMoney: [ refuelMoney: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
@ -409,6 +413,7 @@
activeStatus:'1', activeStatus:'1',
paymentValue:'1', paymentValue:'1',
amountCommission:'', amountCommission:'',
membershipLevel:'',
percentageCommissions:'', percentageCommissions:'',
}, },
tableDatas: [], tableDatas: [],
@ -419,7 +424,8 @@
pageNo:1, pageNo:1,
pageSize:10, pageSize:10,
value: '', value: '',
tableData: [ ] tableData: [ ],
vipname:[]
} }
}, },
@ -447,6 +453,7 @@
chongzhi(){ chongzhi(){
this.form = { this.form = {
sort:1, sort:1,
membershipLevel:'',
groupOriented:1, groupOriented:1,
rechargeBalance:'', rechargeBalance:'',
giftBalance:'', giftBalance:'',
@ -465,8 +472,15 @@
console.log('归零') console.log('归零')
}, },
addblock(){ addblock(){
this.vipname = []
let data = {
pageNo:1,
pageSize:30,
}
listUserGrade(data).then(res=>{
this.vipname = res.data.records
})
this.chongzhi() this.chongzhi()
console.log(this.from)
this.dialog = true this.dialog = true
}, },
posteid(data){ posteid(data){

5
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="queryParams.number" style="width: 20%;margin-right: 10px" placeholder="礼品卡号 "></el-input> <el-input v-model="queryParams.number" style="width: 20%;margin-right: 10px" placeholder="礼品卡号 "></el-input>
<el-input v-model="queryParams.remark" style="width: 20%;margin-right: 10px" placeholder="备注信息"></el-input> <el-input v-model="queryParams.remark" style="width: 20%;margin-right: 10px" placeholder="备注信息"></el-input>
<el-select v-model="queryParams.status" style="margin-right: 10px" placeholder="请选择"> <el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择">
<el-option <el-option
v-for="item in option" v-for="item in option"
:key="item.value" :key="item.value"
@ -15,7 +15,7 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择"> <el-select v-model="queryParams.status" style="margin-right: 10px" placeholder="请选择">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
@ -293,6 +293,7 @@
addList(data).then(res=>{ addList(data).then(res=>{
if(res.code == 200){ if(res.code == 200){
this.$message.success('添加成功'); this.$message.success('添加成功');
this.gettj()
}else { }else {
this.$message.error('操作失败请稍后再试'); this.$message.error('操作失败请稍后再试');
} }

80
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -2,13 +2,14 @@
<div class="app-container"> <div class="app-container">
<!-- 存油卡--> <!-- 存油卡-->
<el-card style="margin-bottom: 20px"> <el-card style="margin-bottom: 20px">
<el-radio-group v-model="queryParams.type"> <el-radio-group v-model="queryParams.type" @input="radiovalue">
<el-radio-button v-for="dict in dict.type.oil_type" <el-radio-button v-for="dict in dict.type.oil_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-radio-button> ></el-radio-button>
</el-radio-group> </el-radio-group>
<div class="top-sousuo"> <div class="top-sousuo">
<el-select v-model="queryParams.oilType" placeholder="请选择"> <el-select v-model="queryParams.oilType" placeholder="请选择">
<el-option <el-option
@ -157,13 +158,13 @@
<el-dialog <el-dialog
title="添加囤油卡" title="添加囤油卡"
:visible.sync="centerDialogVisible" :visible.sync="centerDialogVisible"
width="30%" width="36%"
center> center>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
<el-form-item label="油品类型" prop="oilType"> <el-form-item label="油品类型" prop="oilType">
<el-select v-model="ruleForm.oilType" placeholder="请选择"> <el-select v-model="ruleForm.oilType" placeholder="请选择" >
<el-option <el-option
v-for="dict in oilList" v-for="dict in oilList"
:key="dict.oilName" :key="dict.oilName"
@ -182,22 +183,22 @@
</el-form-item> </el-form-item>
<el-form-item label="锁价单价" prop="name"> <el-form-item label="锁价单价" prop="lockupPrice">
<el-input v-model="ruleForm.lockupPrice"> <el-input v-model="ruleForm.lockupPrice">
<template slot="append">元/升</template> <template slot="append">元/升</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="充值金额" prop="name"> <el-form-item label="充值金额" prop="rechargeBalance">
<el-input v-model="ruleForm.rechargeBalance"> <el-input v-model="ruleForm.rechargeBalance">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="所得升数" prop="name"> <el-form-item label="所得升数" prop="incomeLitres">
<el-input v-model="ruleForm.incomeLitres"> <el-input v-model="ruleForm.incomeLitres">
<template slot="append">升</template> <template slot="append">升</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="赠送积分" prop="name"> <el-form-item label="赠送积分" prop="points">
<el-input v-model="ruleForm.points"> <el-input v-model="ruleForm.points">
<template slot="append">分</template> <template slot="append">分</template>
</el-input> </el-input>
@ -210,19 +211,31 @@
</el-form-item> </el-form-item>
<el-form-item label="时间范围" v-if="ruleForm.activeTime == 2" :label-width="formLabelWidth" prop="startTime"> <el-form-item label="时间范围" v-if="ruleForm.activeTime == 2" :label-width="formLabelWidth" prop="startTime">
<div style="width: 100%;display: flex;align-items: center ">
<div style="width: 45%">
<el-date-picker <el-date-picker
v-model="ruleForm.startTime" v-model="ruleForm.startTime"
type="datetime" type="datetime"
placeholder="开始日期"> placeholder="开始日期">
</el-date-picker> </el-date-picker>
</div>
<div style="width: 5%">
- -
</div>
<div style="width: 45%">
<el-date-picker <el-date-picker
v-model="ruleForm.endTime" v-model="ruleForm.endTime"
type="datetime" type="datetime"
placeholder="结束日期"> placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </div>
</div>
</el-form-item>
<el-form-item label="活动状态" prop="resource"> <el-form-item label="活动状态" prop="resource">
<el-radio-group v-model="ruleForm.activeStatus"> <el-radio-group v-model="ruleForm.activeStatus">
<el-radio label="1">启用</el-radio> <el-radio label="1">启用</el-radio>
@ -233,7 +246,7 @@
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button> <el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="postadd()">确 定</el-button> <el-button type="primary" @click="postadd(ruleForm)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -271,7 +284,7 @@
oilList:[], oilList:[],
ruleForm:{ ruleForm:{
oilType:2, oilType:2,
lockupPrice: '' , lockupPrice: 0 ,
rechargeBalance:'', rechargeBalance:'',
incomeLitres:'', incomeLitres:'',
points:'', points:'',
@ -286,14 +299,41 @@
pageNo:1, pageNo:1,
pageSize:10, pageSize:10,
}, },
rules:{} rules:{
oilType: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
lockupPrice: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
rechargeBalance: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
incomeLitres: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
points: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
}
} }
}, },
mounted() { mounted() {
this.getlist() this.getlist()
},
watch:{
}, },
methods:{ methods:{
radiovalue(){
this.oilList = []
oilName(this.queryParams.type).then(res=>{
this.oilList = res.data
console.log( this.oilList)
})
},
getlist(){ getlist(){
this.queryParams.pageNo=this.pageNo this.queryParams.pageNo=this.pageNo
this.queryParams.pageSize=this.pageSize this.queryParams.pageSize=this.pageSize
@ -303,9 +343,7 @@
this.total = res.data.total; this.total = res.data.total;
} }
}) })
oilName(this.queryParams.type).then(res=>{
this.oilList = res.data
})
}, },
addoilBlock(){ addoilBlock(){
this.ruleForm = { this.ruleForm = {
@ -318,6 +356,7 @@
activeStatus:'1', activeStatus:'1',
tatus:'1' tatus:'1'
}, },
this.radiovalue()
this.centerDialogVisible = true this.centerDialogVisible = true
}, },
posteid(data){ posteid(data){
@ -327,7 +366,11 @@
} }
}) })
}, },
postadd(){ postadd(formName){
if( this.ruleForm.oilType =='' || this.ruleForm.lockupPrice =='' || this.ruleForm.rechargeBalance =='' || this.ruleForm.incomeLitres =='' || this.ruleForm.points =='' ){
this.$message.error("必填项不能为空")
return
}
this.ruleForm.type = this.queryParams.type this.ruleForm.type = this.queryParams.type
this.ruleForm.status = '1' this.ruleForm.status = '1'
if( this.ruleForm.id ){ if( this.ruleForm.id ){
@ -335,17 +378,18 @@
eitList(this.ruleForm).then(res=>{ eitList(this.ruleForm).then(res=>{
if (res.code == 200){ if (res.code == 200){
this.$message.success('修改成功') this.$message.success('修改成功')
this.getlist()
} }
}) })
}else{ }else{
addList(this.ruleForm).then(res=>{ addList(this.ruleForm).then(res=>{
if (res.code == 200){ if (res.code == 200){
this.$message.success('新增成功') this.$message.success('新增成功')
this.getlist()
} }
}) })
} }
this.getlist()
this.centerDialogVisible = false this.centerDialogVisible = false
}, },
handleUpdate(data){ handleUpdate(data){