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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
ds 2024-10-25 09:13:33 +08:00
commit 6d672850da
6 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/router/index.js
View File

@ -93,6 +93,7 @@ export const constantRoutes = [
meta: { title: '系统首页1', icon: 'dashboard', affix: true }
},
// {
// path: 'resource_oilstore',
// component: () => import('@/views/index'),

8
fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
View File

@ -107,6 +107,7 @@ export default {
},
// 新增油价预设
addOilPresePrices() {
this.dialogFormPricesAdd = true
this.oilPresetPrices = {}
// this.selectOilTypeByPrice = this.oilNumberList;
// 油价预设查询列表
@ -164,9 +165,8 @@ export default {
<span>预设油价记录</span>
</div>
<div>
<el-button type="primary" @click = "dialogFormPricesAdd = true,
addOilPresePrices()"
v-hasPermi="['oilConfig:oilPrice:index:addp']"
<el-button type="primary" @click = "addOilPresePrices()"
>新增预设油价</el-button>
</div>
</div>
@ -272,7 +272,7 @@ export default {
</div>
</div>
<el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
<el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="20%" :close-on-click-modal="false">
<el-form ref="priForm" :model="oilPresetPrices" label-width="100px" :rules="oilPresetPricesRules">
<el-form-item label="预设油号" prop="numberId" label-width="120px">
<el-select v-model="oilPresetPrices.numberId" placeholder="请选择油号" @change="oilTypeClickByPrice()">

4
fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
View File

@ -287,7 +287,7 @@ export default {
</div>
<div>
<el-button type="primary" @click="oilTypeMethods(1)"
v-hasPermi="['oilConfig:oilPrice:index:addoil']"
>新增油号</el-button>
</div>
</div>
@ -329,7 +329,7 @@ export default {
</div>
<el-dialog :title="title" width="600px" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-dialog :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-form ref="form" :model="oilNumber" :rules="rules" label-width="130px" >
<el-form-item label="油品类型" prop="oilType">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">

6
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<div class="containers
">
<oilcon></oilcon>
<addprice></addprice>
@ -28,7 +30,7 @@
</script>
<style scoped lang="scss">
.app-container{
.containers{
width: 100%;
height: 100%;
background: #f6f8f9;

1
fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
View File

@ -48,6 +48,7 @@ export default {
}
.f-box{
cursor: pointer;
height: 40px;
color: #999999;
margin-right: 50px;

36
fuintAdmin/src/views/userGrade/index.vue
View File

@ -140,12 +140,12 @@
</div>
<div class="cot-box" v-if="tabindex == 1">
<el-row :gutter="10" class="mb8">
<el-col :span="21">
<span style="font-size: 18px">会员等级</span>
<span style="font-size: 14px">（最多支持20个等级）</span>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="21">-->
<!-- <span style="font-size: 18px">会员等级</span>-->
<!-- <span style="font-size: 14px">（最多支持20个等级）</span>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div>
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="120px">
@ -175,7 +175,7 @@
</el-form>
</div>
<div style="height: 65vh;overflow: auto">
<div style="height: 72vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border>
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="会员等级名称" align="center" prop="name">
@ -352,19 +352,19 @@
@pagination="getList2"
/>
</div>
<div style="width: 100%;height: 15px "></div>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="50%" append-to-body>
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="46%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="会员等级名称" prop="name">
<el-input v-model="form.name" placeholder="请输入会员等级名称"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="升降顺序" prop="grade">
<el-input v-model="form.grade" placeholder="0" maxlength="10"/>
<div style="font-size: 12px;color: #FF9655">默认0为最低一级顺序</div>
@ -372,21 +372,21 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="开卡金额" prop="openCardAmount">
<el-input v-model="form.openCardAmount" placeholder="0" maxlength="200"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="升级所需成长值" prop="growthValue">
<el-input v-model="form.growthValue" placeholder="达到当前等级需要的成长值"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="24">
<el-form-item label="会员降级规则" prop="relegateRuleType">
<!-- <el-input v-model="form.growthValue" placeholder="达到当前等级需要的成长值"/>-->
<div class="d-s">
@ -506,21 +506,21 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="等级说明" prop="gradeIllustrate">
<el-input v-model="form.gradeIllustrate" placeholder="请输入等级说明信息" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="会员权益" prop="userEquity">
<el-input v-model="form.userEquity" placeholder="请输入会员权益信息" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="升级送积分" prop="givePoint">
<el-input v-model="form.givePoint" placeholder="0">
<template slot="append">积分</template>
@ -1937,7 +1937,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 88vh;
height: 86vh;
}
.tab-box {