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

11.20

Browse Source
This commit is contained in:
WN 2024-11-20 14:26:48 +08:00
parent ad0adc0c08
commit 0b6bd0e38b
7 changed files with 771 additions and 685 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/api/integral/category.js
View File

@ -25,4 +25,12 @@ export function getGiftCategoryApi(data) {
}) })
} }
// 删除有关信息
export function deleteGiftCategoryApi(id) {
return request({
url: 'business/integral/integralGiftCategory',
method: 'delete',
params: id
})
}

52
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -222,28 +222,33 @@
:data="tableData" :data="tableData"
border border
style="width: 100%"> style="width: 100%">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="55"></el-table-column> <el-table-column type="index" label="序号" align="center" width="55"></el-table-column>
<el-table-column prop="typeText" label="活动类型"></el-table-column> <el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column> <el-table-column prop="name" label="活动名称" align="center"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column> <el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
<el-table-column prop="time" label="活动时间"> <el-table-column prop="time" label="活动时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.time==0">不限时间</span> <span v-if="scope.row.time==0">不限时间</span>
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span> <span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userGradeName" label="适用会员等级"> <el-table-column prop="userGradeName" label="适用会员等级" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.userGradeName || "--" }}</span> <span>{{ scope.row.userGradeName || "--" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sendNum" label="已领数量"> <el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
<template slot-scope="scope">
<span>{{ scope.row.discountActiveDescribe || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.sendNum || 0 }}</span> <span>{{ scope.row.sendNum || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="activeStatus" label="状态"> <el-table-column prop="activeStatus" label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.activeStatus" v-model="scope.row.activeStatus"
@ -255,8 +260,8 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createName" label="创建人"></el-table-column> <el-table-column prop="createName" label="创建人" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="date" label="操作" align="center"> <el-table-column prop="date" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -321,23 +326,28 @@
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号" width="55"></el-table-column> <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
<el-table-column prop="typeText" label="活动类型"></el-table-column> <el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column> <el-table-column prop="name" label="活动名称" align="center"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column> <el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
<el-table-column prop="time" label="活动时间"> <el-table-column prop="time" label="活动时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.time==0">不限时间</span> <span v-if="scope.row.time==0">不限时间</span>
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span> <span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userGradeName" label="适用会员等级"> <el-table-column prop="userGradeName" label="适用会员等级" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.userGradeName || "--" }}</span> <span>{{ scope.row.userGradeName || "--" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sendNum" label="已领数量"></el-table-column> <el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
<el-table-column prop="activeStatus" label="状态"> <template slot-scope="scope">
<span>{{ scope.row.discountActiveDescribe || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量" align="center"></el-table-column>
<el-table-column prop="activeStatus" label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.activeStatus" v-model="scope.row.activeStatus"
@ -350,8 +360,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createName" label="创建人"></el-table-column> <el-table-column prop="createName" label="创建人" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="date" label="操作" align="center"> <el-table-column prop="date" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

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

@ -1,6 +1,6 @@
<template> <template>
<div class="app-containers"> <div class="app-containers">
<!-- 存油卡--> <!-- 存油卡-->
<div class="card-box" style="margin-bottom: 20px"> <div class="card-box" style="margin-bottom: 20px">
<div class="d-s"> <div class="d-s">
@ -10,7 +10,7 @@
<div style="display: flex;justify-content: space-between;box-sizing: border-box;align-items: center;padding: 1px"> <div style="display: flex;justify-content: space-between;box-sizing: border-box;align-items: center;padding: 1px">
<div class="left-c">新型加油卡，以储油为特色，让车主提前锁定油价，享受便捷灵活的加油体验</div> <div class="left-c">新型加油卡，以储油为特色，让车主提前锁定油价，享受便捷灵活的加油体验</div>
<div> <div>
<el-button type="primary" @click="addCrule()" >编辑囤油卡规则</el-button> <el-button type="primary" @click="addCrule()">编辑囤油卡规则</el-button>
<el-button type="primary" style="margin-bottom: 10px " @click="addoilBlock()">新增囤油卡活动</el-button> <el-button type="primary" style="margin-bottom: 10px " @click="addoilBlock()">新增囤油卡活动</el-button>
</div> </div>
@ -50,7 +50,7 @@
<el-table-column prop="startTime" label="活动时间" align="center" width="165"> <el-table-column prop="startTime" label="活动时间" align="center" width="165">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.activeTime == 1">不限时间</span> <span v-if="scope.row.activeTime == 1">不限时间</span>
<span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span> <span v-if="scope.row.activeTime == 2">{{ scope.row.startTime }}-{{ scope.row.endTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -65,13 +65,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售信息" align="center"> <el-table-column label="销售信息" align="center">
<el-table-column prop="rechargeBalance" label="售出金额（元）" align="center" > </el-table-column> <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="giftBalance" label="售出人数" align="center"></el-table-column>
<el-table-column prop="points" label="会员人数" align="center" > </el-table-column> <el-table-column prop="points" label="会员人数" align="center"></el-table-column>
</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="createTime" label="创建时间" align="center" width="160"> </el-table-column> <el-table-column prop="createTime" label="创建时间" align="center" width="160"></el-table-column>
<el-table-column <el-table-column
@ -83,7 +82,8 @@
size="mini" size="mini"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
@ -113,7 +113,8 @@
<div class="box-der"> <div class="box-der">
<div class="d-b"> <div class="d-b">
<div class="d-s"> <div class="d-s">
<el-input v-model="order.orderNo" style="width: 200px;margin-right: 10px" placeholder="请输入订单号"></el-input> <el-input v-model="order.orderNo" style="width: 200px;margin-right: 10px"
placeholder="请输入订单号"></el-input>
<el-select v-model="order.ordertype" placeholder="请选择" style="width: 200px;margin-right: 10px"> <el-select v-model="order.ordertype" placeholder="请选择" style="width: 200px;margin-right: 10px">
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -130,7 +131,7 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
<el-button type="primary" icon="el-icon-search" @click="RecordList()" >搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="RecordList()">搜索</el-button>
</div> </div>
<el-table <el-table
:data="orderData" :data="orderData"
@ -188,7 +189,7 @@
</el-drawer> </el-drawer>
<!-- 规则--> <!-- 规则-->
<el-dialog :close-on-click-modal="false" title="编辑囤油卡规则" width="30%" :visible.sync="Crule" center> <el-dialog :close-on-click-modal="false" title="编辑囤油卡规则" width="30%" :visible.sync="Crule" center>
<el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="70px" class="demo-ruleForm" > <el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="70px" class="demo-ruleForm">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input disabled v-model="oilForm.name"></el-input> <el-input disabled v-model="oilForm.name"></el-input>
</el-form-item> </el-form-item>
@ -216,7 +217,7 @@
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
<div style="display: flex; align-items: center "> <div style="display: flex; align-items: center ">
<el-form-item label="油品油号" prop="oilNumberId"> <el-form-item label="油品油号" prop="oilNumberId">
<el-select style="width: 440px" v-model="ruleForm.oilNumberId" placeholder="请选择" @change="getoiltype" > <el-select style="width: 440px" v-model="ruleForm.oilNumberId" placeholder="请选择" @change="getoiltype">
<el-option <el-option
v-for="dict in oilList" v-for="dict in oilList"
:key="dict.id" :key="dict.id"
@ -254,7 +255,7 @@
<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="时间范围" v-if="ruleForm.activeTime == 2" prop="startTime"> <el-form-item label="时间范围" v-if="ruleForm.activeTime == 2" prop="endTime">
<div style="width: 100%;display: flex;align-items: center "> <div style="width: 100%;display: flex;align-items: center ">
<div style="width: 200px"> <div style="width: 200px">
<el-date-picker <el-date-picker
@ -297,92 +298,103 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer" center> <span slot="footer" class="dialog-footer" center>
<el-button @click="centerDialogVisible = false">取 消</el-button> <el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="postadd(ruleForm)">确 定</el-button> <el-button type="primary" @click="postadd('ruleForm')">保 存</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics,deleteById,cardFuleOrders} from "@/api/EventMarketing/oilBlock"; import {
import {cardValueRule, saveOrUpdate} from "@/api/EventMarketing/SaveBlock"; getList,
export default { oilName,
addList,
eitList,
getById,
getoilnum,
getstatistics,
deleteById,
cardFuleOrders
} from "@/api/EventMarketing/oilBlock";
import {cardValueRule, saveOrUpdate} from "@/api/EventMarketing/SaveBlock";
export default {
dicts: ['oil_type'], dicts: ['oil_type'],
name: 'index', name: 'index',
data(){ data() {
return{ return {
Crule:false, Crule: false,
gbPrice:null, gbPrice: null,
oilPrice:null, oilPrice: null,
tjlist:[], tjlist: [],
value:'', value: '',
type:0, type: 0,
dataRange:[], dataRange: [],
orderShow:false, orderShow: false,
centerDialogVisible:false, centerDialogVisible: false,
value1:'', value1: '',
total:0, total: 0,
pageNo:1, pageNo: 1,
pageSize:10, pageSize: 10,
oilForm:{}, oilForm: {},
ruleInfo: { ruleInfo: {
participationNo: [ participationNo: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
activeName: [ activeName: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
refuelMoney: [ refuelMoney: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
growthValue: [ growthValue: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
points: [ points: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
giftBalance: [ giftBalance: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
membershipLevel:[ membershipLevel: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
rechargeBalance: [ rechargeBalance: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
groupOriented: [ groupOriented: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
sort: [ sort: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
employeeCommission: [ employeeCommission: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
royaltyType: [ royaltyType: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
resource: [ resource: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
activeTime: [ activeTime: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
activeStatus: [ activeStatus: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
paymentValue: [ paymentValue: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
amountCommission: [ amountCommission: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
percentageCommissions: [ percentageCommissions: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
}, },
options:[ options: [
{ {
value: '0', value: '0',
label: '汽油卡' label: '汽油卡'
@ -406,62 +418,65 @@
value: '2', value: '2',
label: '禁用' label: '禁用'
},], },],
orderTotal:0, orderTotal: 0,
order:{ order: {
orderNo:'', orderNo: '',
ordertype:'', ordertype: '',
cardValueId:'', cardValueId: '',
pageNo:1, pageNo: 1,
pageSize:10 pageSize: 10
}, },
orderData: [{ orderData: [{
date: '2016-05-02', date: '2016-05-02',
name: '王小虎', name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄' address: '上海市普陀区金沙江路 1518 弄'
}, ], },],
tableData: [], tableData: [],
oilList:[], oilList: [],
ruleForm:{ ruleForm: {
oilNumberId:null, oilNumberId: null,
lockupPrice: "" , lockupPrice: "",
lockPrice: "" , lockPrice: "",
lockMoney: "" , lockMoney: "",
rechargeBalance:"", rechargeBalance: "",
incomeLitres:0, incomeLitres: 0,
points:'', points: '',
status:'0', status: '0',
activeTime:'1', activeTime: '1',
activeStatus:'0' activeStatus: '0'
}, },
queryParams:{ queryParams: {
type:'汽油', type: '汽油',
oilType:'', oilType: '',
activeStatus:'', activeStatus: '',
pageNo:1, pageNo: 1,
pageSize:10, pageSize: 10,
}, },
queryParamss:{ queryParamss: {
type:'', type: '',
oilType:'', oilType: '',
activeStatus:'', activeStatus: '',
pageNo:1, pageNo: 1,
pageSize:10, pageSize: 10,
}, },
rules:{ rules: {
oilNumberId: [ oilNumberId: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
rechargeBalance: [ rechargeBalance: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
points: [ points: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
lockPrice: [ lockPrice: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
], ],
incomeLitres:[ incomeLitres: [
{ required: true, message: '不能为空', trigger: 'blur' }, {required: true, message: '不能为空', trigger: 'blur'},
],
endTime: [
{required: true, message: '不能为空', trigger: 'blur'},
] ]
} }
} }
@ -471,24 +486,24 @@
this.getlist() this.getlist()
this.radiovalue() this.radiovalue()
}, },
watch:{ watch: {
'ruleForm.rechargeBalance':{ 'ruleForm.rechargeBalance': {
handler: function() { handler: function () {
if(this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0 ){ if (this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0) {
this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
}else { } else {
this.ruleForm.incomeLitres = 0 this.ruleForm.incomeLitres = 0
} }
}, },
}, },
'ruleForm.lockupPrice':{ 'ruleForm.lockupPrice': {
handler: function() { handler: function () {
if(this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0 ){ if (this.ruleForm.rechargeBalance != 0 && this.ruleForm.lockupPrice != 0) {
this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
}else { } else {
this.ruleForm.incomeLitres = 0 this.ruleForm.incomeLitres = 0
} }
}, },
@ -498,19 +513,19 @@
// 计算属性很重要的特性: 带缓存, 性能极强 // 计算属性很重要的特性: 带缓存, 性能极强
// 在第一次使用该属性时进行计算, 计算后将结果缓存起来, 后面如果还有其他地方用到, 会直接从缓存中取值, 不会再次计算 // 在第一次使用该属性时进行计算, 计算后将结果缓存起来, 后面如果还有其他地方用到, 会直接从缓存中取值, 不会再次计算
// 如果依赖的数据更新, 也会重新计算, 然后重复上述操作 // 如果依赖的数据更新, 也会重新计算, 然后重复上述操作
totalCount () { totalCount() {
console.log('我是 computed 里的求和属性') console.log('我是 computed 里的求和属性')
this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice this.ruleForm.incomeLitres = this.ruleForm.rechargeBalance / this.ruleForm.lockupPrice
return this.ruleForm.incomeLitres return this.ruleForm.incomeLitres
} }
}, },
methods:{ methods: {
submitForms(formName) { submitForms(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
saveOrUpdate(this.oilForm).then(res=>{ saveOrUpdate(this.oilForm).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.$message.success('成功') this.$message.success('成功')
this.Crule = false this.Crule = false
} }
@ -524,19 +539,19 @@
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.Crule = false this.Crule = false
}, },
addCrule(){ addCrule() {
this.Crule =! this.Crule this.Crule = !this.Crule
cardValueRule({type:'1'}).then(res=>{ cardValueRule({type: '1'}).then(res => {
this.oilForm = res.data this.oilForm = res.data
}) })
}, },
lookorder(){ lookorder() {
this.orderShow = !this.orderShow this.orderShow = !this.orderShow
this.RecordList() this.RecordList()
}, },
RecordList(){ RecordList() {
cardFuleOrders(this.addDateRange(this.order,this.dataRange)).then(res=>{ cardFuleOrders(this.addDateRange(this.order, this.dataRange)).then(res => {
this.orderData = res.data.records this.orderData = res.data.records
this.order.total = res.data.total this.order.total = res.data.total
@ -544,10 +559,10 @@
}) })
}, },
getoiltype(e){ getoiltype(e) {
getoilnum(e).then(res=>{ getoilnum(e).then(res => {
console.log(res) console.log(res)
if(res.code == 200){ if (res.code == 200) {
this.gbPrice = res.data.gbPrice this.gbPrice = res.data.gbPrice
this.oilPrice = res.data.oilPrice this.oilPrice = res.data.oilPrice
} }
@ -555,9 +570,9 @@
}) })
}, },
radiovalue(lable){ radiovalue(lable) {
this.oilList = [] this.oilList = []
oilName(this.queryParams.type).then(res=>{ oilName(this.queryParams.type).then(res => {
this.oilList = res.data.records this.oilList = res.data.records
}) })
this.getlist() this.getlist()
@ -565,70 +580,71 @@
// 重置按钮操作 // 重置按钮操作
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
type:'汽油', type: '汽油',
oilType:'', oilType: '',
activeStatus:'', activeStatus: '',
pageNo:1, pageNo: 1,
pageSize:10, pageSize: 10,
} }
this.getlist(); this.getlist();
}, },
getlist(){ getlist() {
this.queryParams.pageNo=this.pageNo this.queryParams.pageNo = this.pageNo
this.queryParams.pageSize=this.pageSize this.queryParams.pageSize = this.pageSize
getList(this.queryParams).then(res=>{ getList(this.queryParams).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.tableData = res.data.records this.tableData = res.data.records
this.total = res.data.total; this.total = res.data.total;
} }
}) })
getstatistics().then(res=>{ getstatistics().then(res => {
console.log(res) console.log(res)
this.tjlist = res.data this.tjlist = res.data
}) })
}, },
addoilBlock(){ addoilBlock() {
this.gbPrice = null, this.gbPrice = null,
this.oilPrice=null, this.oilPrice = null,
this.ruleForm = { this.ruleForm = {
type:this.queryParams.type, type: this.queryParams.type,
lockupPrice: 0 , lockupPrice: 0,
rechargeBalance:0, rechargeBalance: 0,
incomeLitres:0, incomeLitres: 0,
points:'', points: '',
activeTime:'1', activeTime: '1',
activeStatus:'1', activeStatus: '1',
tatus:'1' tatus: '1'
}, },
this.radiovalue() this.radiovalue()
this.centerDialogVisible = true this.centerDialogVisible = true
}, },
posteid(data){ posteid(data) {
eitList(data).then(res=>{ eitList(data).then(res => {
if (res.code == 200){ if (res.code == 200) {
this.$message.success('修改成功') this.$message.success('修改成功')
} }
}) })
}, },
postadd(formName){ postadd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.ruleForm.type = this.queryParams.type this.ruleForm.type = this.queryParams.type
this.ruleForm.status = '1' this.ruleForm.status = '1'
// this.ruleForm.startTime = this.ruleForm.startTime.toLocaleDateString() // this.ruleForm.startTime = this.ruleForm.startTime.toLocaleDateString()
// this.ruleForm.endTime = this.ruleForm.endTime.toLocaleDateString() // this.ruleForm.endTime = this.ruleForm.endTime.toLocaleDateString()
if( this.ruleForm.id ){ if (this.ruleForm.id) {
console.log("修改") console.log("修改")
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() 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()
} }
@ -636,19 +652,22 @@
} }
this.centerDialogVisible = false this.centerDialogVisible = false
}
});
}, },
handleDelete(data){ handleDelete(data) {
this.$modal.confirm('确定删除此条电子囤油卡信息？').then(function() { this.$modal.confirm('确定删除此条电子囤油卡信息？').then(function () {
return deleteById(data.id); return deleteById(data.id);
}).then(() => { }).then(() => {
this.getlist() this.getlist()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
handleUpdate(data){ handleUpdate(data) {
getById(data.id).then(res=>{ getById(data.id).then(res => {
if (res.code == 200){ if (res.code == 200) {
this.ruleForm = res.data this.ruleForm = res.data
this.centerDialogVisible = true this.centerDialogVisible = true
} }
@ -656,23 +675,25 @@
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.d-b{ .d-b {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
} }
.top-sousuo{
.top-sousuo {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.tjbox{
.tjbox {
width: 19%; width: 19%;
background: #f9f9f9; background: #f9f9f9;
margin-right: 1%; margin-right: 1%;
@ -680,42 +701,49 @@
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
border-radius: 6px; border-radius: 6px;
} }
.cu{
.cu {
font-weight: bold; font-weight: bold;
} }
.wrap-box{
.wrap-box {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 20px; margin-bottom: 20px;
} }
.card-box{
.card-box {
width: 100%; width: 100%;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
border-radius: 10px; border-radius: 10px;
} }
.box-der{
.box-der {
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
} }
.gang{
.gang {
width: 2px; width: 2px;
height: 13px; height: 13px;
background: #FF9655; background: #FF9655;
margin-right: 5px; margin-right: 5px;
} }
.d-s{
.d-s {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.left-c{
background: rgba(255,150,85,0.15); .left-c {
background: rgba(255, 150, 85, 0.15);
font-size: 12px; font-size: 12px;
color: #FF9655; color: #FF9655;
box-sizing: border-box; box-sizing: border-box;
padding: 4px 15px ; padding: 4px 15px;
} }
</style> </style>

45
fuintAdmin/src/views/integral/giftCategory/index.vue
View File

@ -53,7 +53,7 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column label="分类名称" align="center" prop="categoryName"/> <el-table-column label="分类名称" align="center" prop="categoryName"/>
<el-table-column label="创建人" align="createBy" prop="sort" /> <el-table-column label="创建人" align="center" prop="createByName" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
@ -68,11 +68,17 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['integral:giftCategory:index:update']" v-hasPermi="['integral:giftCategory:index:update']"
>修改</el-button> >修改</el-button>
<el-button
size="mini"
type="text"
@click="handleDelete(scope.row)"
v-hasPermi="['integral:giftCategory:index:update']"
>删除</el-button>
</template> </template>
<!-- v-hasPermi="['']"--> <!-- v-hasPermi="['']"-->
</el-table-column> </el-table-column>
@ -102,8 +108,8 @@
:value="dict.value"/> :value="dict.value"/>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="categoryName"> <el-form-item label="备注" >
<el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="分类名称" maxlength="30"/> <el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="请输入备注" maxlength="30"/>
</el-form-item> </el-form-item>
@ -120,7 +126,12 @@
<script> <script>
import {getGiftCategoryApi,insertGiftCategoryApi,updateGiftCategoryApi } from "@/api/integral/category"; import {
deleteGiftCategoryApi,
getGiftCategoryApi,
insertGiftCategoryApi,
updateGiftCategoryApi
} from "@/api/integral/category";
export default { export default {
name: "giftCategory", name: "giftCategory",
@ -228,6 +239,30 @@ export default {
this.open = true this.open = true
this.getList(); this.getList();
}, },
// 删除信息
handleDelete(data){
this.$confirm('是否删除本条数据，删除后无法恢复!', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteGiftCategoryApi({id:data.id}).then(res=>{
if (res.code == 200) {
this.$message({
type: 'success',
message: '删除成功!'
});
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
resetQuery(){ resetQuery(){
this.queryParams = {} this.queryParams = {}
this.getList(); this.getList();

1
fuintAdmin/src/views/order/order_Added.vue
View File

@ -105,6 +105,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.status != 0"
size="mini" size="mini"
type="text" type="text"
@click="returnRecord(scope.row.id)" @click="returnRecord(scope.row.id)"

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGiftCategory.java
View File

@ -35,6 +35,10 @@ public class IntegralGiftCategory extends BaseEntity {
* 店铺ID * 店铺ID
*/ */
private Integer storeId; private Integer storeId;
/**
* 创建人
*/
private String createByName;
} }

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftCategoryMapper.xml
View File

@ -23,9 +23,9 @@
</select> </select>
<!--查询指定行数据--> <!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="IntegralGiftCategoryMap"> <select id="queryAllByLimit" resultType="com.fuint.business.integral.entity.IntegralGiftCategory">
select select
igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createBy igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createByName
from integral_gift_category igc from integral_gift_category igc
left join mt_staff ta on igc.create_by=ta.id left join mt_staff ta on igc.create_by=ta.id
<where> <where>