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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-15 16:52:09 +08:00
commit 24c476cb57
23 changed files with 250 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,26 @@
<template>
<div class="app-container">
<!-- 储值卡-->
<el-card style="margin-bottom: 20px">
<el-radio-group v-model="isonline" @input="getlist()">
<el-radio-button label="0">可用</el-radio-button>
<el-radio-button label="1">已下线</el-radio-button>
</el-radio-group>
<el-card style="margin-bottom: 20px;">
<div style="display: flex;align-items: center;justify-content: space-between">
<div>
<el-breadcrumb separator="/">
<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>
</div>
<div>
<el-radio-group v-model="isonline" @input="getlist()">
<el-radio-button label="0">可用</el-radio-button>
<el-radio-button label="1">已下线</el-radio-button>
</el-radio-group>
</div>
</div>
</el-card>
<el-card style="margin-bottom: 20px">

31
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -1,8 +1,12 @@
<template>
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>消费有礼</el-breadcrumb-item>
</el-breadcrumb>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
@ -25,6 +29,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -1136,6 +1141,30 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
chainStorId: null,
storeId: null,
name: null,
participationConditionMoney: null,
activeStartTime: null,
activeEndTime: null,
adaptOil: [],
adaptUserType: null,
memberType: null,
dieselUserLevel: null,
gasolineUserLevel: null,
naturalUserLevel: null,
paymentType: null,
participationCondition: null,
participationAcount: null,
limitAcount: null,
activeGift: [],
points: null,
status: null,
isonline: null,
}
this.resetForm("queryForm");
this.handleQuery();
},

6
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -2,6 +2,11 @@
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>折扣营销</el-breadcrumb-item>
</el-breadcrumb>
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
@ -24,6 +29,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

7
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -1,7 +1,13 @@
<template>
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>满减营销</el-breadcrumb-item>
</el-breadcrumb>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
@ -24,6 +30,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

6
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -1,6 +1,11 @@
<template>
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>新人有礼</el-breadcrumb-item>
</el-breadcrumb>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="name">
@ -26,6 +31,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

6
fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
View File

@ -1,6 +1,11 @@
<template>
<div class="appconter">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>推荐有礼</el-breadcrumb-item>
</el-breadcrumb>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="活动名称" prop="activeName">
<el-input
@ -24,6 +29,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

1
fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
View File

@ -32,6 +32,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>

36
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -2,6 +2,11 @@
<!-- 优惠券页面-->
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="name">
<el-input v-model="queryParams.name" placeholder="优惠券名称"></el-input>
@ -27,6 +32,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -669,6 +675,36 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
chainStorId: null,
storeId: null,
isonline: null,
name: null,
type: null,
discountType: null,
oilType: null,
fullDeduction: null,
discountAmount: null,
satisfiedAmount: null,
specialDiscount: null,
discountOffset: null,
validity: null,
effectiveDate: null,
effectiveTime: null,
availablePeriod: null,
checkDateType: null,
checkTime: [],
checkOutTime: null,
exclusiveFunctionList: [],
exclusiveFunction: null,
claimRule: null,
count: null,
qrCodeLink: null,
status: null,
effectiveDateType:'0'
}
this.resetForm("queryForm");
this.handleQuery();
},

9
fuintAdmin/src/views/EventMarketing/exchange/index.vue
View File

@ -1,12 +1,17 @@
<template>
<div class="app-container">
<el-card style="margin-bottom: 20px">
<div style="width: 100%;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="value">
<el-radio-button label="1">兑换券</el-radio-button>
<!-- <el-radio-button label="2">领取记录</el-radio-button>
<el-radio-button label="3">核销记录</el-radio-button>-->
<el-radio-button label="4">在线核销</el-radio-button>
</el-radio-group>
</div>
</el-card>
<cardExchange v-if="value == 1"></cardExchange>
<cardExchangeRecord v-if="value == 2"></cardExchangeRecord>

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

@ -3,6 +3,12 @@
<!-- 礼品卡-->
<el-card style="margin-bottom: 20px">
<div class="top-hang">
<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-select v-model="queryParams.cardAmount" clearable style="margin-right: 10px" placeholder="请选择面值">
<el-option
v-for="item in jglist"
@ -28,6 +34,7 @@
</el-option>
</el-select>
<el-button type="primary" icon="el-icon-search" @click="getlist">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<div class="butoon">
<a style=";color: #00afff"
href="/fuint-application/business/marketingActivity/cardGift/export"> 下载模板 </a >
@ -458,6 +465,18 @@ import {
})
},
// 重置按钮操作
resetQuery() {
this.queryParams = {
number:'',
remark:'',
activateStatus:null,
status:'',
pageNo:1,
pageSize:10
}
this.getlist();
},
getlist(){
getselectGiftValue().then(res=>{
console.log(res)

26
fuintAdmin/src/views/EventMarketing/online/index.vue
View File

@ -7,8 +7,9 @@
<!-- 17615834396-->
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input>
</div>
<div style="width: 10%;margin-left: 20px">
<div style="width: 10%;margin-left: 20px;display: flex">
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
@ -65,6 +66,29 @@
}
},
methods:{
// 重置按钮操作
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 999,
cardExchangeId: null,
mtStaffId: null,
realName: null,
staffMobile: null,
mtUserId: null,
name: null,
mobile: null,
photo: null,
exchangeName: null,
ticketCode: null,
exchangeFrom: null,
status: 0,
outTime: null,
cancelTime: null,
startTime: null,
endTime: null,
}
},
getList() {
if(!this.queryParams.mobile ){
this.$message.error("输入框不能为空")

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

@ -2,6 +2,12 @@
<div class="app-container">
<!-- 存油卡-->
<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"
@ -9,7 +15,7 @@
:value="dict.value"
></el-radio-button>
</el-radio-group>
</div>
<div class="top-sousuo">
<el-select v-model="queryParams.oilType" clearable placeholder="请选择油号">
<el-option
@ -28,6 +34,7 @@
</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>
<el-card style="margin-bottom: 15px">
@ -453,6 +460,17 @@
})
this.getlist()
},
// 重置按钮操作
resetQuery() {
this.queryParams = {
type:'汽油',
oilType:'',
activeStatus:'',
pageNo:1,
pageSize:10,
}
this.getlist();
},
getlist(){
this.queryParams.pageNo=this.pageNo
this.queryParams.pageSize=this.pageSize

30
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -1,6 +1,11 @@
<template>
<div class="app-container">
<el-card style="margin-bottom: 20px">
<el-breadcrumb separator="/" style="margin-bottom: 35px">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
<el-breadcrumb-item>一键发券</el-breadcrumb-item>
</el-breadcrumb>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="name">
<el-input
@ -12,6 +17,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -957,6 +963,30 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
chainStorId: null,
storeId: null,
name: null,
participationConditionMoney: null,
activeStartTime: null,
activeEndTime: null,
adaptOil: [],
adaptUserType: null,
memberType: null,
dieselUserLevel: null,
gasolineUserLevel: null,
naturalUserLevel: null,
paymentType: null,
participationCondition: null,
participationAcount: null,
limitAcount: null,
activeGift: [],
points: null,
status: null,
isonline: null,
}
this.resetForm("queryForm");
this.handleQuery();
},

2
fuintAdmin/src/views/convenienceStore/damage/details.vue
View File

@ -268,7 +268,7 @@ export default {
state:'await',
numberInput:false,
saveFlag:false,
auditFlag:true,
voidFlag:true,

1
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -119,6 +119,7 @@
<el-table-column label="进货价" prop="buyingPrice" align="center" width="70"/>
<el-table-column label="零售价" prop="retailPrice" align="center" width="70"/>
<el-table-column label="会员价" prop="memberPrice" align="center" width="70"/>
<el-table-column label="排序" prop="sort" align="center" width="70"/>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<el-tag v-if="scope.row.status=='qy'">上架</el-tag>

13
fuintAdmin/src/views/integral/order/pointsMall.vue
View File

@ -314,7 +314,18 @@ export default {
handleClick(tab, event) {
// this.resetQuery2()
this.resetQuery()
this.queryParams = {
orderType:0,
giftName: '',
mobile:'',
shippingType: '',
orderStatus:'',
pageNo:1,
pageSize:10
},
this.dateRange = []
this.beginTime = ""
this.endTime = ""
this.queryParams.orderStatus = tab.name
console.log(tab.name);
this.getList();

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

@ -95,7 +95,7 @@
</div>
<div class="box-gang">
<div class="box">
<div class="size-bole">{{ total }}</div>
<div class="size-bole">{{ total || 0 }}</div>
<div class="size-hui">
<div class="nei">挂账笔数</div>
<div class="icon-img">
@ -104,7 +104,7 @@
</div>
</div>
<div class="box">
<div class="size-bole">{{ allAmount }}</div>
<div class="size-bole">{{ allAmount || 0 }}</div>
<div class="size-hui">
<div class="nei">挂账总额</div>
<div class="icon-img">
@ -113,7 +113,7 @@
</div>
</div>
<div class="box">
<div class="size-bole">{{ returnTotal }}</div>
<div class="size-bole">{{ returnTotal || 0 }}</div>
<div class="size-hui">
<div class="nei">归还笔数</div>
<div class="icon-img">
@ -122,7 +122,7 @@
</div>
</div>
<div class="box">
<div class="size-bole">{{ returnAllAmount }}</div>
<div class="size-bole">{{ returnAllAmount || 0 }}</div>
<div class="size-hui">
<div class="nei">归还总额</div>
<div class="icon-img">
@ -131,7 +131,7 @@
</div>
</div>
<div class="box">
<div class="size-bole">{{ noReturnAllAmount }}</div>
<div class="size-bole">{{ noReturnAllAmount || 0 }}</div>
<div class="size-hui">
<div class="nei">未还金额</div>
<div class="icon-img">
@ -204,7 +204,7 @@
<el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
</el-table-column>
<el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间" width="220">
<el-table-column prop="createTime" align="center" label="挂账单位创建时间" width="220">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@ -483,19 +483,19 @@ export default {
this.returnTotal = res.data
})
hangBillAllAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
// if (res.data) {
this.allAmount = res.data
}
// }
})
hangBillAllReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
// if (res.data) {
this.returnAllAmount = res.data
}
// }
})
hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
// if (res.data) {
this.noReturnAllAmount = res.data
}
// }
})
},
// 搜索按钮操作

2
fuintAdmin/src/views/order/order_Goods.vue
View File

@ -37,6 +37,7 @@
v-model="queryParams.orderNo"
placeholder="订单号"
clearable
@input="$forceUpdate"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -45,6 +46,7 @@
v-model="queryParams.payUser"
placeholder="手机号"
clearable
@input="$forceUpdate"
@keyup.enter.native="handleQuery"
/>
</el-form-item>

6
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -822,12 +822,10 @@
.size-hui{
display: flex;
align-items: center;
//width: 200px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 13px;
color: #888888;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;
@ -836,15 +834,11 @@
}
}
.size-bole{
//font-weight: bold;
//width: 53px;
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;

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

@ -562,7 +562,6 @@ export default {
}
}
.size-bole{
height:31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;

5
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -117,12 +117,12 @@ export default {
if (this.ruleForm.dutyId) {
updateRole(this.ruleForm).then(response => {
this.$modal.msgSuccess("修改成功");
this.$router.push("/Site/index")
this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
});
} else {
addRole(this.ruleForm).then(response => {
this.$modal.msgSuccess("新增成功");
this.$router.push("/Site/index")
this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
});
}
}
@ -130,6 +130,7 @@ export default {
},
resetForm(formName) {
this.$refs[formName].resetFields();
this.$router.push({path:"/Site/index",query:{activeName:"duty"}})
},
// 查询
selectChildByDeptIdApi() {

8
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -1238,6 +1238,10 @@ export default {
this.getList();
this.selectChildByDeptIdApi();
if (this.$route.query.activeName){
this.activeName = this.$route.query.activeName
this.handleClick()
}
},
components: { Treeselect },
@ -1811,11 +1815,11 @@ export default {
{!isAdd ?
< img alt="" src="http://47.95.206.185:83/add.png" style=" width: 20px;height: 20px; " on-click={() => this.append(data)}/>
< img alt="" src="https://www.youkerr.com/add" style=" width: 20px;height: 20px; " on-click={() => this.append(data)}/>
: null
}
{node.level !== 1 ?
< img alt="" src="http://47.95.206.185:83/del.png" style=" width: 20px;height: 20px; " on-click={() => this.remove(node, data)}/>
< img alt="" src="https://www.youkerr.com/del" style=" width: 20px;height: 20px; " on-click={() => this.remove(node, data)}/>
: null
}

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

@ -55,6 +55,7 @@
and update_by = #{integralGiftCategory.updateBy}
</if>
</where>
order by create_time desc
</select>
<!--统计总行数-->