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

9.15

Browse Source
This commit is contained in:
cun-nan 2024-09-15 18:31:33 +08:00
parent 53c1254eca
commit edd677bae7
2 changed files with 145 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
View File

@ -95,13 +95,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- --> <!-- -->
<div class="d-b" style="margin-bottom: 15px;margin-top: 20px"> <div class="d-b" style="margin-bottom: 15px;margin-top: 20px">
<div class="d-s"> <div class="d-s">
@ -314,7 +307,7 @@
<div style="display: flex;width: 100%;margin: 20px 0;"> <div style="display: flex;width: 100%;margin: 20px 0;">
<div style="width: 50%"> <div style="width: 50%">
<el-form-item label="限时优惠名称" prop="activeId"> <el-form-item label="限时优惠名称" prop="activeId">
<el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称"> <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称" style="width: 100%">
<el-option <el-option
v-for="(item,index) in timeShareList" v-for="(item,index) in timeShareList"
:key="index" :key="index"
@ -333,7 +326,7 @@
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label=" 会员标签" prop="babelIds"> <el-form-item label=" 会员标签" prop="babelIds">
<el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签"> <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%">
<el-option <el-option
v-for="item in userLabelList" v-for="item in userLabelList"
:key="item.id+''" :key="item.id+''"
@ -341,36 +334,73 @@
:value="item.id+''"></el-option> :value="item.id+''"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用实收金额" required> <el-form-item label="消费条件" required>
<el-col :span="11"> <div v-if="ruleForm1.consumeType!=1">
<el-form-item prop="moneyMin"> <el-col :span="7">
<el-input v-model="ruleForm1.moneyMin"></el-input> <el-select v-model="ruleForm1.consumeType" style="width: 90%">
</el-form-item> <el-option label="实收金额" value="0"></el-option>
</el-col> <el-option label="加油升数" value="1"></el-option>
<el-col :span="2"> </el-select>
<div style="margin-left: 5px">到</div> </el-col>
</el-col> <el-col :span="7">
<el-col :span="11"> <el-form-item prop="moneyMin">
<el-form-item prop="moneyMax"> <el-input v-model="ruleForm1.moneyMin">
<el-input v-model="ruleForm1.moneyMax"></el-input> <template slot="append">元</template>
</el-form-item> </el-input>
</el-col> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="适用加油升数" required> <el-col :span="2">
<el-col :span="11"> <div style="margin-left: 10px">到</div>
<el-form-item prop="literMin"> </el-col>
<el-input v-model="ruleForm1.literMin"></el-input> <el-col :span="7">
</el-form-item> <el-form-item prop="moneyMax">
</el-col> <el-input v-model="ruleForm1.moneyMax">
<el-col :span="2"> <template slot="append">元</template>
<div style="margin-left: 5px">到</div> </el-input>
</el-col> </el-form-item>
<el-col :span="11"> </el-col>
<el-form-item prop="literMax"> </div>
<el-input v-model="ruleForm1.literMax"></el-input> <div v-if="ruleForm1.consumeType==1">
</el-form-item> <el-col :span="7">
</el-col> <el-select v-model="ruleForm1.consumeType" style="width: 90%">
<el-option label="实收金额" value="0"></el-option>
<el-option label="加油升数" value="1"></el-option>
</el-select>
</el-col>
<el-col :span="7">
<el-form-item prop="moneyMin">
<el-input v-model="ruleForm1.literMin">
<template slot="append">L</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div style="margin-left: 10px">到</div>
</el-col>
<el-col :span="7">
<el-form-item prop="moneyMax">
<el-input v-model="ruleForm1.literMax">
<template slot="append">L</template>
</el-input>
</el-form-item>
</el-col>
</div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="适用加油升数" required>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMin">-->
<!-- <el-input v-model="ruleForm1.literMin"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div style="margin-left: 5px">到</div>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMax">-->
<!-- <el-input v-model="ruleForm1.literMax"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<el-form-item label="最大优惠金额" prop="disMax"> <el-form-item label="最大优惠金额" prop="disMax">
<el-input v-model="ruleForm1.disMax"></el-input> <el-input v-model="ruleForm1.disMax"></el-input>
</el-form-item> </el-form-item>
@ -383,7 +413,7 @@
<el-input v-model="ruleForm1.ruleName"></el-input> <el-input v-model="ruleForm1.ruleName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用会员等级" prop="levelId"> <el-form-item label="适用会员等级" prop="levelId">
<el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级"> <el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级" style="width: 100%">
<el-option <el-option
v-for="(item,index) in userGradeList" v-for="(item,index) in userGradeList"
:label="item.name" :label="item.name"
@ -499,7 +529,7 @@ export default {
// 限时 // 限时
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 5, pageSize: 1000,
activeType: 2 activeType: 2
}, },
total: 0, total: 0,
@ -576,6 +606,7 @@ export default {
ruleForm1: { ruleForm1: {
activeType: 2, activeType: 2,
timeType: 0, timeType: 0,
consumeType:'',
paymentType: [] paymentType: []
} }
} }
@ -666,7 +697,7 @@ export default {
}, },
// 查询限时优惠列表信息 // 查询限时优惠列表信息
getTimeShareList() { getTimeShareList() {
getRequestList({pageNo: 1, pageSize: 10000}).then(res => { getRequestList({pageNo: 1, pageSize: 10000,activeType:2}).then(res => {
this.timeShareList = res.data.records this.timeShareList = res.data.records
}) })
}, },

120
fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
View File

@ -95,13 +95,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- --> <!-- -->
<div class="d-b" style="margin-bottom: 15px;margin-top: 20px"> <div class="d-b" style="margin-bottom: 15px;margin-top: 20px">
<div class="d-s"> <div class="d-s">
@ -342,41 +335,72 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="消费条件" required> <el-form-item label="消费条件" required>
<el-col :span="7"> <div v-if="ruleForm1.consumeType!=1">
<el-select v-model="ruleForm1.consumeType" multiple style="width: 90%"> <el-col :span="7">
<el-option label="实收金额" value="0"></el-option> <el-select v-model="ruleForm1.consumeType" style="width: 90%">
<el-option label="加油升数" value="1"></el-option> <el-option label="实收金额" value="0"></el-option>
</el-select> <el-option label="加油升数" value="1"></el-option>
</el-col> </el-select>
<el-col :span="7"> </el-col>
<el-form-item prop="moneyMin"> <el-col :span="7">
<el-input v-model="ruleForm1.moneyMin"></el-input> <el-form-item prop="moneyMin">
</el-form-item> <el-input v-model="ruleForm1.moneyMin">
</el-col> <template slot="append">元</template>
<el-col :span="3"> </el-input>
<div style="margin-left: 10px">到</div> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="2">
<el-form-item prop="moneyMax"> <div style="margin-left: 10px">到</div>
<el-input v-model="ruleForm1.moneyMax"></el-input> </el-col>
</el-form-item> <el-col :span="7">
</el-col> <el-form-item prop="moneyMax">
</el-form-item> <el-input v-model="ruleForm1.moneyMax">
<el-form-item label="适用加油升数" required> <template slot="append">元</template>
<el-col :span="11"> </el-input>
<el-form-item prop="literMin"> </el-form-item>
<el-input v-model="ruleForm1.literMin"></el-input> </el-col>
</el-form-item> </div>
</el-col> <div v-if="ruleForm1.consumeType==1">
<el-col :span="2"> <el-col :span="7">
<div style="margin-left: 5px">到</div> <el-select v-model="ruleForm1.consumeType" style="width: 90%">
</el-col> <el-option label="实收金额" value="0"></el-option>
<el-col :span="11"> <el-option label="加油升数" value="1"></el-option>
<el-form-item prop="literMax"> </el-select>
<el-input v-model="ruleForm1.literMax"></el-input> </el-col>
</el-form-item> <el-col :span="7">
</el-col> <el-form-item prop="moneyMin">
<el-input v-model="ruleForm1.literMin">
<template slot="append">L</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div style="margin-left: 10px">到</div>
</el-col>
<el-col :span="7">
<el-form-item prop="moneyMax">
<el-input v-model="ruleForm1.literMax">
<template slot="append">L</template>
</el-input>
</el-form-item>
</el-col>
</div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="适用加油升数" required>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMin">-->
<!-- <el-input v-model="ruleForm1.literMin"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div style="margin-left: 5px">到</div>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMax">-->
<!-- <el-input v-model="ruleForm1.literMax"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<el-form-item label="最大优惠金额" prop="disMax"> <el-form-item label="最大优惠金额" prop="disMax">
<el-input v-model="ruleForm1.disMax"></el-input> <el-input v-model="ruleForm1.disMax"></el-input>
</el-form-item> </el-form-item>
@ -502,7 +526,7 @@ export default {
// 分时 // 分时
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 5, pageSize: 10000,
activeType: 1 activeType: 1
}, },
total: 0, total: 0,
@ -579,6 +603,7 @@ export default {
ruleForm1: { ruleForm1: {
activeType: 1, activeType: 1,
timeType: 0, timeType: 0,
consumeType:'',
paymentType: [] paymentType: []
} }
} }
@ -589,9 +614,10 @@ export default {
}, },
methods: { methods: {
// 重置活动规则 // 重置活动规则
resetRule(){ resetRule() {
this.ruleForm1 = { this.ruleForm1 = {
activeType: 1, activeType: 1,
consumeType:'',
timeType: 0, timeType: 0,
paymentType: [] paymentType: []
} }
@ -600,7 +626,7 @@ export default {
this.monthDay = [] this.monthDay = []
}, },
// 删除活动规则 // 删除活动规则
deleteRule(data){ deleteRule(data) {
deletePriceRule(data.id).then(res => { deletePriceRule(data.id).then(res => {
this.$message.success("删除成功") this.$message.success("删除成功")
this.getRuleList() this.getRuleList()
@ -616,12 +642,12 @@ export default {
this.getUserLabelList() this.getUserLabelList()
this.showDialogVisible = true this.showDialogVisible = true
if (res.data){ if (res.data) {
this.ruleForm1 = res.data this.ruleForm1 = res.data
if (res.data.paymentType) this.ruleForm1.paymentType = res.data.paymentType.split(",") if (res.data.paymentType) this.ruleForm1.paymentType = res.data.paymentType.split(",")
if (res.data.babelIds) this.ruleForm1.babelIds = res.data.babelIds.split(",") if (res.data.babelIds) this.ruleForm1.babelIds = res.data.babelIds.split(",")
if (res.data.timeSlots){ if (res.data.timeSlots) {
if (res.data.timeType == "0") { if (res.data.timeType == "0") {
this.weekDay = this.ruleForm1.timeSlots.split(",") this.weekDay = this.ruleForm1.timeSlots.split(",")
} else if (this.ruleForm1.timeType == "1") { } else if (this.ruleForm1.timeType == "1") {
@ -669,7 +695,7 @@ export default {
}, },
// 查询分时优惠列表信息 // 查询分时优惠列表信息
getTimeShareList() { getTimeShareList() {
getRequestList({pageNo: 1, pageSize: 10000}).then(res => { getRequestList({pageNo: 1, pageSize: 10000,activeType:1}).then(res => {
this.timeShareList = res.data.records this.timeShareList = res.data.records
}) })
}, },