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

10.22

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-22 10:05:09 +08:00
parent 0d952a0082
commit cdb9262c12
4 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/views/member/index.vue
View File

@ -181,6 +181,7 @@
<span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}</span> <span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="会员标签" align="center" prop="userLabelName" > <el-table-column label="会员标签" align="center" prop="userLabelName" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.userLabelName || '--' }}</span> <span>{{ scope.row.userLabelName || '--' }}</span>

35
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -31,10 +31,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="d-s" >-->
<!-- <div style="font-size: 12px;margin-right: 5px">储值卡：￥{{chooseVipUser.cardBalance}} </div>-->
<!-- <div style="font-size: 12px">囤油卡：￥1000.000</div>-->
<!-- </div>-->
</div> </div>
<div class="d-s" style="width: 50%"> <div class="d-s" style="width: 50%">
@ -151,17 +147,18 @@
<div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div> <div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div>
</div> </div>
</div> </div>
<div class="tab-kuang" style="flex-wrap: wrap;justify-content: space-between "> <div class="tab-kuang" style="flex-wrap: wrap;">
<div :class=item.classStyle v-for="(item,index) in dataList" @click="setRefuelingAmount(item)"> <div class="zo_box" v-for="(item,index) in dataList">
<div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div> <div :class=item.classStyle @click="setRefuelingAmount(item)">
<div class="card-title">{{ item.gunName }}</div> <div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
<div class="c-b-d"> <div class="card-title">{{ item.gunName }}</div>
<img :src=item.img style="width: 16px;height: 16px"> <div class="c-b-d">
<div>{{ item.tankName }}</div> <img :src=item.img style="width: 16px;height: 16px">
<div>{{ item.tankName }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div style=" position: absolute;bottom: 0px; width: 100%;"> <div style=" position: absolute;bottom: 0px; width: 100%;">
<div class="c-bottom"> <div class="c-bottom">
@ -2543,15 +2540,17 @@ input {
padding: 20px; padding: 20px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
align-content: flex-start; //align-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
overflow: auto; overflow: auto;
height: 68vh; height: 68vh;
} }
.zo_box{
width: 33.3%;
}
.card92 { .card92 {
width: 31%; width: 95%;
height: 90px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
padding: 5px; padding: 5px;
@ -2569,7 +2568,7 @@ input {
} }
.card0 { .card0 {
width: 31%; width: 95%;
height: 90px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
padding: 5px; padding: 5px;
@ -2586,7 +2585,7 @@ input {
} }
.card98 { .card98 {
width: 31%; width: 95%;
height: 90px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
padding: 5px; padding: 5px;
@ -2603,7 +2602,7 @@ input {
} }
.card95 { .card95 {
width: 31%; width: 95%;
height: 90px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
padding: 5px; padding: 5px;

34
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -76,7 +76,7 @@
<div> <div>
<div class="box-gang"> <div class="box-gang">
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px;">
{{ orderStatistics.theTotalAmount || 0 }}/{{ orderStatistics.numberOfProducts || 0 }} {{ orderStatistics.theTotalAmount || 0 }}/{{ orderStatistics.numberOfProducts || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -85,7 +85,7 @@
</div> </div>
</div> </div>
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
{{ orderStatistics.theTotalAmount || 0 }} {{ orderStatistics.theTotalAmount || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -94,7 +94,7 @@
</div> </div>
</div> </div>
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
{{ orderStatistics.discountAmount || 0 }} {{ orderStatistics.discountAmount || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -103,7 +103,7 @@
</div> </div>
</div> </div>
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
{{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }} {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -112,7 +112,7 @@
</div> </div>
</div> </div>
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
{{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }} {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -121,7 +121,7 @@
</div> </div>
</div> </div>
<div class="box2"> <div class="box2">
<div style="font-size: 26px;color: #F7B500;font-weight: bold;margin-top: 5px"> <div class="x_size" style="font-size: 26px;color: #F7B500;font-weight: bold;margin-top: 5px">
{{ orderStatistics.cash || 0 }} {{ orderStatistics.cash || 0 }}
</div> </div>
<div class="size-hui"> <div class="size-hui">
@ -184,7 +184,7 @@
<span>{{ parseTime(scope.row.payTime) }}</span> <span>{{ parseTime(scope.row.payTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="300" 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 style="color: #fe8c4a" @click="patchwork(scope.row)" <el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
type="text" >补打 type="text" >补打
@ -200,15 +200,13 @@
</el-table> </el-table>
</div> </div>
<div class="pagination-box"> <div class="pagination-box">
<el-pagination <pagination
background
layout="prev, pager, next"
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.page" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@current-change="getList"> @pagination="getList"
</el-pagination> />
</div> </div>
<!-- 订单退款--> <!-- 订单退款-->
<el-dialog <el-dialog
@ -457,7 +455,7 @@ export default {
margin: 5px 0px; margin: 5px 0px;
} }
.box-ge{ .box-ge{
border-bottom: 1px solid #000000 ;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
} }
@ -872,7 +870,8 @@ export default {
.table-box { .table-box {
width: 100%; width: 100%;
min-height: 69vh; height: 65vh;
overflow: auto;
} }
.pagination-box { .pagination-box {
@ -880,7 +879,7 @@ export default {
margin: 10px auto; margin: 10px auto;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: flex-end;
} }
.top-app-sou { .top-app-sou {
@ -939,4 +938,9 @@ export default {
padding: 15px; padding: 15px;
height: 64px; height: 64px;
} }
.x_size{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style> </style>

2
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -111,7 +111,6 @@
</el-form> </el-form>
</div> </div>
<div class="cot-box"> <div class="cot-box">
<div> <div>
<div class="box-gang"> <div class="box-gang">
<div class="box2"> <div class="box2">
@ -181,7 +180,6 @@
</div> </div>
</div> </div>
<div class="new_bottom"> <div class="new_bottom">
<el-table <el-table
v-loading="loading" v-loading="loading"
border border