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:
@QQNZX 2023-11-20 11:23:38 +08:00
parent 5009a627aa
commit 53524364dc
9 changed files with 180 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/layout/components/Sidebar/Logo.vue
View File

@ -4,6 +4,7 @@
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
<!-- <h1 v-else class="sidebar-title" style="color: #00ff80" >{{ title }} </h1>-->
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />

3
fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue
View File

@ -10,7 +10,7 @@
<el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body> <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
<template slot="title"> <template slot="title">
<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" /> <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
</template> </template>
<sidebar-item <sidebar-item
v-for="child in item.children" v-for="child in item.children"
@ -20,6 +20,7 @@
:base-path="resolvePath(child.path)" :base-path="resolvePath(child.path)"
class="nest-menu" class="nest-menu"
/> />
</el-submenu> </el-submenu>
</div> </div>
</template> </template>

4
fuintAdmin/src/layout/components/Sidebar/index.vue
View File

@ -10,9 +10,9 @@
:default-active="activeMenu" :default-active="activeMenu"
:collapse="false" :collapse="false"
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground" :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
:text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor" text-color="#ffffff"
:unique-opened="true" :unique-opened="true"
:active-text-color="settings.theme" active-text-color="#409eff"
:collapse-transition="false" :collapse-transition="false"
mode="vertical" mode="vertical"
style="margin-bottom: 80px;" style="margin-bottom: 80px;"

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

@ -44,6 +44,12 @@
<el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange">
<el-table-column
type="index"
align="center"
label="排序"
>
</el-table-column>
<el-table-column label="活动编号" align="center" prop="id" /> <el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" /> <el-table-column label="活动名称" align="center" prop="name" />
@ -305,22 +311,32 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<el-form-item label="活动开始时间" prop="activeStartTime">
<el-date-picker clearable <el-row :gutter="20">
v-model="form.activeStartTime" <el-col :span="12">
type="datetime" <el-form-item label="活动开始时间" prop="activeStartTime">
value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker clearable
placeholder="请选择活动开始时间"> v-model="form.activeStartTime"
</el-date-picker> type="datetime"
</el-form-item> value-format="yyyy-MM-dd HH:mm:ss"
<el-form-item label="活动结束时间" prop="activeEndTime"> placeholder="请选择活动开始时间">
<el-date-picker clearable </el-date-picker>
v-model="form.activeEndTime" </el-form-item>
type="datetime" </el-col>
value-format="yyyy-MM-dd HH:mm:ss" <el-col :span="12">
placeholder="请选择活动结束时间"> <el-form-item label="活动结束时间" prop="activeEndTime">
</el-date-picker> <el-date-picker clearable
</el-form-item> v-model="form.activeEndTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择活动结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" > <el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级"> <el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option> <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
@ -621,7 +637,7 @@ export default {
activeStartTime: [ activeStartTime: [
{ required: true, message: '必填项不能为空', trigger: 'blur' }, { required: true, message: '必填项不能为空', trigger: 'blur' },
], ],
activeEndTime00: [ activeEndTime: [
{ required: true, message: '必填项不能为空', trigger: 'blur' }, { required: true, message: '必填项不能为空', trigger: 'blur' },
], ],
adaptUserType: [ adaptUserType: [
@ -666,6 +682,9 @@ export default {
this.listUserGrade() this.listUserGrade()
}, },
methods: { methods: {
indexMethod(index) {
return index * 2;
},
/** 查询消费有礼活动列表 */ /** 查询消费有礼活动列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -1044,5 +1063,6 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-size: 18px;
} }
</style> </style>

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

@ -43,7 +43,12 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="activeDiscountList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="activeDiscountList" @selection-change="handleSelectionChange">
<el-table-column
type="index"
align="center"
label="排序"
>
</el-table-column>
<el-table-column label="活动编号" align="center" prop="id" /> <el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" /> <el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" > <el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
@ -90,7 +95,7 @@
</el-card> </el-card>
<!-- 添加或修改折扣营销对话框 --> <!-- 添加或修改折扣营销对话框 -->
<el-dialog :title="title" :visible.sync="open" width="45%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="活动名称" prop="name"> <el-form-item label="活动名称" prop="name">
<el-input v-model="form.name" placeholder="请输入活动名称" /> <el-input v-model="form.name" placeholder="请输入活动名称" />
</el-form-item> </el-form-item>
@ -113,22 +118,34 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="活动开始时间" prop="activeStartTime">
<el-date-picker clearable <el-row :gutter="20">
v-model="form.activeStartTime" <el-col :span="12">
type="datetime" <el-form-item label="活动开始时间" prop="activeStartTime">
value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker clearable
placeholder="请选择活动开始时间"> v-model="form.activeStartTime"
</el-date-picker> type="datetime"
</el-form-item> value-format="yyyy-MM-dd HH:mm:ss"
<el-form-item label="活动结束时间" prop="activeEndTime"> placeholder="请选择活动开始时间">
<el-date-picker clearable </el-date-picker>
v-model="form.activeEndTime" </el-form-item>
type="datetime" </el-col>
value-format="yyyy-MM-dd HH:mm:ss" <el-col :span="12">
placeholder="请选择活动结束时间"> <el-form-item label="活动结束时间" prop="activeEndTime">
</el-date-picker> <el-date-picker clearable
</el-form-item> v-model="form.activeEndTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择活动结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="可用油品" prop="adaptOil" > <el-form-item label="可用油品" prop="adaptOil" >
<el-checkbox-group v-model="form.adaptOil"> <el-checkbox-group v-model="form.adaptOil">
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox> <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>

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

@ -43,7 +43,12 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange">
<el-table-column
type="index"
align="center"
label="排序"
>
</el-table-column>
<el-table-column label="活动编号" align="center" prop="id" /> <el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" /> <el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="会员等级" align="center" prop="dieselUserLevel" > <el-table-column label="会员等级" align="center" prop="dieselUserLevel" >
@ -120,22 +125,34 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="活动开始时间" prop="activeStartTime">
<el-date-picker clearable <el-row :gutter="20">
v-model="form.activeStartTime" <el-col :span="12">
type="datetime" <el-form-item label="活动开始时间" prop="activeStartTime">
value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker clearable
placeholder="请选择活动开始时间"> v-model="form.activeStartTime"
</el-date-picker> type="datetime"
</el-form-item> value-format="yyyy-MM-dd HH:mm:ss"
<el-form-item label="活动结束时间" prop="activeEndTime"> placeholder="请选择活动开始时间">
<el-date-picker clearable </el-date-picker>
v-model="form.activeEndTime" </el-form-item>
type="datetime" </el-col>
value-format="yyyy-MM-dd HH:mm:ss" <el-col :span="12">
placeholder="请选择活动结束时间"> <el-form-item label="活动结束时间" prop="activeEndTime">
</el-date-picker> <el-date-picker clearable
</el-form-item> v-model="form.activeEndTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择活动结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="可用油品" prop="adaptOil" > <el-form-item label="可用油品" prop="adaptOil" >
<el-checkbox-group v-model="form.adaptOil"> <el-checkbox-group v-model="form.adaptOil">
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox> <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>

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

@ -44,7 +44,12 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange">
<el-table-column
type="index"
align="center"
label="排序"
>
</el-table-column>
<el-table-column label="活动编号" align="center" prop="id" /> <el-table-column label="活动编号" align="center" prop="id" />
<el-table-column label="活动名称" align="center" prop="name" /> <el-table-column label="活动名称" align="center" prop="name" />
<el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180"> <el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180">
@ -116,22 +121,28 @@
<el-form-item label="活动名称" prop="name"> <el-form-item label="活动名称" prop="name">
<el-input v-model="form.name" placeholder="请输入活动名称" /> <el-input v-model="form.name" placeholder="请输入活动名称" />
</el-form-item> </el-form-item>
<el-form-item label="活动开始时间" prop="activeStartTime"> <el-row :gutter="20">
<el-date-picker clearable <el-col :span="12">
v-model="form.activeStartTime" <el-form-item label="活动开始时间" prop="activeStartTime">
type="datetime" <el-date-picker clearable
value-format="yyyy-MM-dd HH:mm:ss" v-model="form.activeStartTime"
placeholder="请选择活动开始时间"> type="datetime"
</el-date-picker> value-format="yyyy-MM-dd HH:mm:ss"
</el-form-item> placeholder="请选择活动开始时间">
<el-form-item label="活动结束时间" prop="activeEndTime"> </el-date-picker>
<el-date-picker clearable </el-form-item>
v-model="form.activeEndTime" </el-col>
type="datetime" <el-col :span="12">
value-format="yyyy-MM-dd HH:mm:ss" <el-form-item label="活动结束时间" prop="activeEndTime">
placeholder="请选择活动结束时间"> <el-date-picker clearable
</el-date-picker> v-model="form.activeEndTime"
</el-form-item> type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择活动结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="有礼奖励" prop="courtesyReward" > <el-form-item label="有礼奖励" prop="courtesyReward" >
<el-checkbox-group v-model="form.courtesyReward"> <el-checkbox-group v-model="form.courtesyReward">
@ -813,3 +824,12 @@ export default {
} }
}; };
</script> </script>
<style scoped>
.box-bt{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 18px;
}
</style>

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

@ -183,27 +183,35 @@
<el-form-item label="生效日期" prop="timeType"> <el-form-item label="生效日期" prop="timeType">
<el-radio-group v-model="form.timeType"> <el-radio-group v-model="form.timeType">
<!-- 0 --> <!-- 0 -->
<el-radio label="0"> <el-radio label="0" style="display: flex;align-items: center" >
领券后立即生效，有效期 <div class="h-box"> <span>领券后立即生效，有效期</span> <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
<template slot="append">天</template> <template slot="append">天</template>
</el-input> </el-input> </div>
</el-radio> </el-radio>
<!-- 1 --> <!-- 1 -->
<el-radio label="1" style="display: flex;align-items: center" >
<el-radio label="1">固定有效周期，固定开始日期 <el-date-picker <div class="h-box">
<span> 固定有效周期，固定开始日期</span>
<el-date-picker
v-model="form.effectiveDate" v-model="form.effectiveDate"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
有效期 <span>有效期</span>
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input> <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
</div>
</el-radio> </el-radio>
<!-- 2--> <!-- 2-->
<el-radio label="2">领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay"> <el-radio label="2" style="display: flex;align-items: center">
<div class="h-box">
领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay">
<template slot="append">天生效</template> <template slot="append">天生效</template>
</el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input> </el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input>
</div>
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -295,7 +303,6 @@
<div style="display: flex;align-items: center"> <div style="display: flex;align-items: center">
<div class="qr-code" id="qrCode" ref="qrCodeUrl"></div> <div class="qr-code" id="qrCode" ref="qrCodeUrl"></div>
</div> </div>
<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="centerDialogVisible = false">确 定</el-button> <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
@ -450,6 +457,7 @@ export default {
count: null, count: null,
qrCodeLink: null, qrCodeLink: null,
status: null, status: null,
effectiveDateType:'0'
}, },
tongji:{ tongji:{
id:'', id:'',
@ -580,8 +588,8 @@ export default {
storeId: null, storeId: null,
isonline: 0, isonline: 0,
name: null, name: null,
type: null, type: "0",
discountType: null, discountType: "0",
oilType: [], oilType: [],
fullDeduction: null, fullDeduction: null,
discountAmount: null, discountAmount: null,
@ -717,6 +725,10 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
/deep/.el-radio{
//display: flex !important;
//align-items: center !important;
}
.hui-box{ .hui-box{
width: 150px ; width: 150px ;
height: 80px; height: 80px;
@ -730,5 +742,12 @@ export default {
font-weight: bold; font-weight: bold;
margin: 5px 0px; margin: 5px 0px;
} }
.h-box{
height: 60px;
display: flex;
align-items: center;
}
</style> </style>

5
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -75,7 +75,7 @@ export default {
this.couponList = response.data.records; this.couponList = response.data.records;
this.total = response.data.total this.total = response.data.total
if( response.data.total == 0){ if( response.data.total == 0){
this.$message.error("未找到兑换券")
}else{ }else{
} }
@ -98,9 +98,6 @@ export default {
this.getList() this.getList()
} }
}) })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',