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

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

@ -73,7 +73,6 @@
<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
label="编辑" label="编辑"
> >
@ -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"
@ -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,15 +298,26 @@
</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 {
getList,
oilName,
addList,
eitList,
getById,
getoilnum,
getstatistics,
deleteById,
cardFuleOrders
} from "@/api/EventMarketing/oilBlock";
import {cardValueRule, saveOrUpdate} from "@/api/EventMarketing/SaveBlock"; import {cardValueRule, saveOrUpdate} from "@/api/EventMarketing/SaveBlock";
export default { export default {
dicts: ['oil_type'], dicts: ['oil_type'],
name: 'index', name: 'index',
@ -462,6 +474,9 @@
], ],
incomeLitres: [ incomeLitres: [
{required: true, message: '不能为空', trigger: 'blur'}, {required: true, message: '不能为空', trigger: 'blur'},
],
endTime: [
{required: true, message: '不能为空', trigger: 'blur'},
] ]
} }
} }
@ -613,7 +628,8 @@
}) })
}, },
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()
@ -636,6 +652,8 @@
} }
this.centerDialogVisible = false this.centerDialogVisible = false
}
});
}, },
handleDelete(data) { handleDelete(data) {
@ -644,7 +662,8 @@
}).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 => {
@ -667,11 +686,13 @@
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;
@ -681,15 +702,18 @@
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;
@ -697,20 +721,24 @@
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 { .left-c {
background: rgba(255, 150, 85, 0.15); background: rgba(255, 150, 85, 0.15);
font-size: 12px; font-size: 12px;

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>