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

10.14

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-14 15:54:26 +08:00
parent 8696af8903
commit f306c1e6ab
4 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuintAdmin/src/views/fleet/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-center">
<div class="app-r">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }">
<div :body-style="{ padding: '0px' }">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('车队信息')">
<div class="fount-box" :style="{ color: radio1 === '车队信息' ? '#FF770F' : '#999999' }">车队信息</div>
@ -15,7 +15,7 @@
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
</el-card>
</div>
</div>
<fleetInfo v-if="radio1 === '车队信息'"></fleetInfo>
@ -53,7 +53,9 @@ export default {
</script>
<style lang="scss" scoped>
.app-r{
}
.app-center{
width: 100%;
box-sizing: border-box;
@ -63,9 +65,10 @@ export default {
.app-top{
width: 100%;
//margin-bottom: 20px;
height: 50px;
height: 42px;
box-sizing: border-box;
padding: 0px;
border-top: 1px solid #eceff1;
}
.el-card__body, .el-main {
padding: 0px;

23
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="padding-top: 15px;padding-bottom: 10px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<div style="box-sizing: border-box;padding: 10px; background: #f6f8f9; height: 88vh ">
<div class="bor_s" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="fleetName" style="width: 180px">
@ -51,7 +51,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="handleAdd">新增车队</el-button>
@ -60,6 +60,7 @@
</el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card" style="min-height: 500px;" shadow="never">-->
<div class="table-box">
@ -130,11 +131,11 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-dialog :title="title" :visible.sync="open" width="32%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" />
@ -143,7 +144,7 @@
<el-form-item label="卡类型" prop="cardType">
<el-checkbox-group v-model="form.cardType">
<el-checkbox label="储值卡" name="type"></el-checkbox>
<el-checkbox label="囤油卡" name="type"></el-checkbox>
<!-- <el-checkbox label="囤油卡" name="type"></el-checkbox>-->
</el-checkbox-group>
</el-form-item>
<el-form-item label="车队负责人" prop="fleetLeader">
@ -494,7 +495,7 @@ export default {
.table-box {
width: 100%;
height: 67.5vh;
height: 74vh;
overflow: auto;
}
@ -552,5 +553,11 @@ export default {
color: #fff;
}
.bor_s{
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 15px;
}
</style>

42
fuintAdmin/src/views/fleet/tab/fleetMember.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="padding-top: 15px;padding-bottom: 10px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<div style="box-sizing: border-box;padding: 10px; background: #f6f8f9;">
<div class="bor_s" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="fleetName" style="width: 180px">
@ -55,7 +55,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="handleAdd">新增成员</el-button>
@ -154,7 +154,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
@ -381,7 +381,7 @@
size="60%"
:before-close="handleClose">
<div style="display: grid; place-items: center;">
<el-card class="box-card">
<div class="sfjl-top">
<el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="">
<el-select
@ -413,14 +413,15 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card" style="margin-top: 15px">
<el-table ref="tables" v-loading="loading" :data="consumeList">
<div style="display: flex;align-items: center">
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
</div>
</div>
<div class="box-card" style="width: 95%;margin: 0 auto">
<el-table ref="tables" border="" v-loading="loading" :data="consumeList">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="订单号" prop="orderNo" align="center"></el-table-column>
<el-table-column label="机构信息" prop="storeId" align="center"></el-table-column>
@ -443,7 +444,7 @@
:limit.sync="queryParams2.pageSize"
@pagination="getRecordList"
/>
</el-card>
</div>
</div>
</el-drawer>
</div>
@ -839,7 +840,7 @@ export default {
.table-box {
width: 100%;
height: 68vh;
height: 73vh;
overflow: auto;
}
@ -848,4 +849,17 @@ export default {
line-height: 30px;
font-size: 16px;
}
.sfjl-top{
width: 95%;
box-sizing: border-box;
padding: 10px;
display: flex;
justify-content: space-between;
}
.bor_s{
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 15px;
}
</style>

4
fuintAdmin/src/views/shopowner.vue
View File

@ -106,7 +106,7 @@
</div>
<div class="h-r-ba"></div>
<div>
<!-- <div class="h-tt" >活跃油站</div>-->
<!-- <div class="h-tt" >活跃油站</div>-->
<div class="d-s" style="justify-content: space-between">
<div id="cccc" style="width: 300px;height: 200px;margin-right: 50px"></div>
<div id="ccct" style="width: 300px;height: 200px;"></div>
@ -125,7 +125,7 @@
content="联系电话：1352415811">
<img slot="reference" style="width: 28px; height: 28px " src="../assets/images/telindex.png">
</el-popover>
</div>
</div>
<div style="height: 90%;overflow: auto;scrollbar-width: none;">
<div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
<div class="r-img">