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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-06 09:00:43 +08:00
parent 6d62e856b5
commit c69442eaa8
24 changed files with 810 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,10 @@
<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-form-item label="活动名称" prop="name">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入活动名称"
placeholder="活动名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -16,13 +16,13 @@
<!-- <el-option label="禁用" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline">
<el-form-item label="" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-option label="在线" value="0"></el-option>
<el-option label="下线" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>

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

@ -2,10 +2,10 @@
<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-form-item label="活动名称" prop="name">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入活动名称"
placeholder="活动名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -16,13 +16,13 @@
<!-- <el-option label="禁用" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-form-item label="" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="是否在线">
<el-option label="在线" value="0"></el-option>
<el-option label="下线" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>

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

@ -3,10 +3,10 @@
<el-card style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="活动名称" prop="name">
<el-form-item label="" prop="name">
<div style="width: 220px"> <el-input
v-model="queryParams.name"
placeholder="请输入活动名称"
placeholder="活动名称"
clearable
@keyup.enter.native="handleQuery"
/></div>
@ -18,13 +18,13 @@
<!-- <el-option label="禁用" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline">
<el-form-item label="" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-option label="在线" value="0"></el-option>
<el-option label="下线" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>

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

@ -5,7 +5,7 @@
<el-form-item label="活动名称" prop="activeName">
<el-input
v-model="queryParams.activeName"
placeholder="请输入活动名称"
placeholder="活动名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -17,12 +17,12 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否在线" prop="isonline">
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否在线">
<el-select v-model="queryParams.isonline" clearable placeholder="是否在线">
<el-option label="在线" value="0"></el-option>
<el-option label="下线" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>

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

@ -30,7 +30,7 @@
<!-- <el-option label="洗车卡" value="2"></el-option>-->
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>
</el-form>

2
fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
View File

@ -27,7 +27,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>

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

@ -25,7 +25,7 @@
&lt;!&ndash; <el-option label="通用券" value="2"></el-option>&ndash;&gt;
</el-select>-->
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>
</el-form>

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

@ -11,7 +11,7 @@
</el-radio-group>
<div class="top-sousuo">
<el-select v-model="queryParams.oilType" clearable placeholder="请选择">
<el-select v-model="queryParams.oilType" clearable placeholder="请选择油号">
<el-option
v-for="dict in oilList"
:key="dict.id"
@ -19,7 +19,7 @@
:value="dict.id">
</el-option>
</el-select>
<el-select v-model="queryParams.activeStatus" placeholder="请选择" style="margin:0px 20px">
<el-select v-model="queryParams.activeStatus" placeholder="状态" style="margin:0px 20px">
<el-option
v-for="item in option"
:key="item.value"
@ -27,7 +27,7 @@
:value="item.value">
</el-option>
</el-select>
<el-button type="primary" style="margin-left: 20px" icon="el-icon-search" @click="getlist">搜索</el-button>
<el-button type="primary" style="margin-left: 20px ;float: right" icon="el-icon-search" @click="getlist">搜索</el-button>
</div>
</el-card>
<el-card style="margin-bottom: 15px">

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

@ -2,15 +2,15 @@
<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-form-item label="活动名称" prop="name">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.activeName"
placeholder="请输入活动名称"
placeholder="活动名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>
</el-form>

113
fuintAdmin/src/views/integral/order/pointsCashier.vue
View File

@ -67,32 +67,49 @@
<el-row :gutter="10" class="mb8" >
<el-col :span="2.5">
<div class="box">
<span class="font-chinese">笔数</span>
<span class="font-number">{{statisticsForm.num}}</span>
<div class="size-bole">{{statisticsForm.num}}</div>
<div class="size-hui">
<div class="nei">笔数</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</el-col>
<el-col :span="2.5">
<div class="box">
<span class="font-chinese">商品数量</span>
<span class="font-number">{{statisticsForm.exchangeQuantity?statisticsForm.exchangeQuantity:0}}</span>
<div class="size-bole">{{statisticsForm.exchangeQuantity?statisticsForm.exchangeQuantity:0}}</div>
<div class="size-hui">
<div class="nei">商品数量</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</el-col>
<el-col :span="2.5">
<div class="box">
<span class="font-chinese">积分</span>
<span class="font-number">{{statisticsForm.integral?statisticsForm.integral:0}}</span>
<div class="size-bole">{{statisticsForm.integral?statisticsForm.integral:0}}</div>
<div class="size-hui">
<div class="nei">积分</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</el-col>
<el-col :span="3">
<div class="box">
<span class="font-chinese">支付总额
<el-tooltip class="item" effect="dark" content="实际支付订单详细信息请在增值订单页面查看
" placement="top-start">
<i class="el-icon-info"></i>
</el-tooltip>
</span>
<span class="font-number">{{statisticsForm.amount?statisticsForm.amount:0}}</span>
<div class="size-bole">{{statisticsForm.amount?statisticsForm.amount:0}}</div>
<div class="size-hui">
<div class="nei">支付总额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</el-col>
</el-row>
</el-card>
@ -265,19 +282,65 @@ export default {
padding-top: 0px;
padding: 0px
}
.box {
padding: 10px;
height: 80px;
width: 150px;
margin-right: 0px;
background-color: rgba(204, 204, 204, 0.3);
border-radius: 8px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: left;
text-align: left;
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
.box{
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.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;
.nei {
width: 150px;
}
}
.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;
}
.font-chinese {
font-size: 15px;

20
fuintAdmin/src/views/order/index.vue
View File

@ -2,11 +2,11 @@
<div class="app-container">
<el-card>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -14,10 +14,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
placeholder="全部"
placeholder="支付类型"
clearable
style="width: 240px"
>
@ -29,23 +29,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
placeholder="订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号" prop="payUser">
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入会员手机号"
placeholder="手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@ -57,7 +57,7 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>

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

@ -3,20 +3,20 @@
<div class="app-container"> <!-- 表单查询-->
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="归还状态" prop="returnType">
<el-form-item label="" prop="returnType">
<el-select
v-model="queryParams.returnType"
clearable
placeholder="全部"
placeholder="归还状态"
>
<el-option label="挂账" value="0"></el-option>
<el-option label="归还" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="订单状态" prop="status">
<el-form-item label="" prop="status">
<el-select
v-model="queryParams.status"
placeholder="全部"
placeholder="订单状态"
clearable
>
<el-option label="未归还" value="0"></el-option>
@ -24,23 +24,23 @@
<el-option label="部分归还" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="单位名称" prop="unitName">
<el-form-item label="" prop="unitName">
<el-input
v-model="queryParams.unitName"
placeholder="请输入挂账单位名称"
placeholder="单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="挂账人" prop="personCredit">
<el-form-item label="" prop="personCredit">
<el-input
v-model="queryParams.personCredit"
placeholder="请输入挂账人名称"
placeholder="挂账人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系电话" prop="contactMobile">
<el-form-item label="" prop="contactMobile">
<el-input
v-model="queryParams.contactMobile"
placeholder="请输入挂账人联系电话"
@ -48,7 +48,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人手机号" prop="mobile">
<el-form-item label="" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入操作人手机号"
@ -56,7 +56,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="">
<!-- 挂账人-->
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -81,7 +82,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -94,24 +95,49 @@
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">挂账笔数</div>
<div class="size-bole">{{ total }}</div>
<div class="size-hui">
<div class="nei">挂账笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">挂账总额</div>
<div class="size-bole">{{ allAmount }}</div>
<div class="size-hui">
<div class="nei">挂账总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">归还笔数</div>
<div class="size-bole">{{ returnTotal }}</div>
<div class="size-hui">
<div class="nei">归还笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">归还总额</div>
<div class="size-bole">{{ returnAllAmount }}</div>
<div class="size-hui">
<div class="nei">归还总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">未还金额</div>
<div class="size-bole">{{ noReturnAllAmount }}</div>
<div class="size-hui">
<div class="nei">未还金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</div>
</el-card>
@ -512,20 +538,50 @@ export default {
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
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;
.nei {
width: 150px;
}
}
.size-bole{
font-weight: bold;
//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;
}
.wgang{
width: 100%;
@ -549,5 +605,17 @@ export default {
width: 20%;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
</style>

134
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -3,11 +3,11 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -15,10 +15,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -33,17 +33,17 @@
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -55,32 +55,67 @@
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">笔数</div>
<div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
<div class="size-hui">
<div class="nei">笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">订单总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
<div class="size-hui">
<div class="nei">订单总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">实付总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}</div>
<div class="size-hui">
<div class="nei">实付总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">油品优惠</div>
<div class="size-bole">{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}</div>
<div class="size-hui">
<div class="nei">油品优惠</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">油品总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}</div>
<div class="size-hui">
<div class="nei">油品总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">商品总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
<div class="size-hui">
<div class="nei">商品总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">找零总金额</div>
<div class="size-bole">{{ seekZeroAmount }}</div>
<div class="size-hui">
<div class="nei">找零总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</div>
@ -657,22 +692,65 @@ import {refundApi} from "@/api/order/refund";
display: flex;
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
.box{
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.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;
.nei {
width: 150px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
}
.size-bole{
font-weight: bold;
}
.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;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
.wgang{
width: 100%;
display: flex;

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

@ -5,11 +5,11 @@
<!-- <div>-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -17,10 +17,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
placeholder="全部"
placeholder="支付类型"
clearable
style="width: 240px"
>
@ -32,23 +32,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
placeholder="订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号" prop="payUser">
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入会员手机号"
placeholder="手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -73,7 +73,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -85,32 +85,67 @@
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">商品笔数</div>
<div class="size-bole">{{orderStatistics.numberOfProducts}}</div>
<div class="size-hui">
<div class="nei">商品笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">总金额</div>
<div class="size-bole">{{orderStatistics.theTotalAmount || 0}}</div>
<div class="size-hui">
<div class="nei">总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">商品总数量</div>
<div class="size-bole">{{orderStatistics.theTotalNumberOfUnits || 0}}</div>
<div class="size-hui">
<div class="nei">商品总数量</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">优惠金额</div>
<div class="size-bole">{{orderStatistics.discountAmount || 0}}</div>
<div class="size-hui">
<div class="nei">优惠金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">微信</div>
<div class="size-bole">{{orderStatistics.wechat}}</div>
<div class="size-hui">
<div class="nei">微信</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">支付宝</div>
<div class="size-bole">{{orderStatistics.alipay}}</div>
<div class="size-hui">
<div class="nei">支付宝</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">现金</div>
<div class="size-bole">{{orderStatistics.cash}}</div>
<div class="size-hui">
<div class="nei">现金</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
@ -118,7 +153,7 @@
</el-card>
<el-card class="box-card">
<div class="wgang">
<div>商品交易列表</div>
<div></div>
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelGoodsOrder()">导出订单</el-button>
</div>
@ -575,20 +610,50 @@ export default {
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
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;
.nei {
width: 150px;
}
}
.size-bole{
font-weight: bold;
//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;
}
.wgang{
width: 100%;
@ -612,5 +677,17 @@ export default {
width: 20%;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
</style>

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

@ -6,11 +6,11 @@
<!-- <div style="display: flex;">-->
<!-- <div class="top-app-sou">-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -18,11 +18,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="终端" prop="terminal">
<el-form-item label="" prop="terminal">
<el-select
v-model="queryParams.terminal"
clearable
placeholder="全部"
placeholder="终端"
>
<el-option v-for="item in terminalList"
:key="item.id"
@ -31,11 +31,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="全部"
placeholder="支付类型"
>
<el-option v-for="item in payList"
:key="item.id"
@ -46,15 +46,15 @@
<el-option label="储值卡" value="balance"/>
</el-select>
</el-form-item>
<el-form-item label="手机号">
<el-form-item label="">
<el-input v-model="queryParams.payUser" clearable placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="油枪号" prop="oilGunNum">
<el-form-item label="" prop="oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="全部"
placeholder="油枪号"
>
<el-option v-for="item in oilGunList"
:key="item.id"
@ -65,10 +65,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="订单号、官方单号检索"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -83,17 +83,17 @@
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
placeholder="交易开始日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -110,36 +110,76 @@
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">油品笔数</div>
<div class="size-bole">{{orderStatistics.numberOfOilPens}}</div>
<div class="size-hui">
<div class="nei">油品笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">油品总金额</div>
<div class="size-bole">{{orderStatistics.theTotalAmountOfOil || 0}}</div>
<div class="size-hui">
<div class="nei">油品总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">优惠总额</div>
<div class="size-bole">{{orderStatistics.theTotalAmountOfTheOffer || 0}}</div>
<div class="size-hui">
<div class="nei">优惠总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">交易数量</div>
<div class="size-bole">{{orderStatistics.numberOfTransactions || 0}}</div>
<div class="size-hui">
<div class="nei">交易数量</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">实收总额</div>
<div class="size-bole">{{orderStatistics.totalAmountReceived || 0}}</div>
<div class="size-bole">{{orderStatistics.totalAmountReceived || 0}}</div>
<div class="size-hui">
<div class="nei">实收总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">微信</div>
<div class="size-bole">{{orderStatistics.wechat}}</div>
<div class="size-bole">{{orderStatistics.wechat}}</div>
<div class="size-hui">
<div class="nei">微信</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">支付宝</div>
<div class="size-bole">{{orderStatistics.alipay}}</div>
<div class="size-bole">{{orderStatistics.alipay}}</div>
<div class="size-hui">
<div class="nei">支付宝</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">现金</div>
<div class="size-bole">{{orderStatistics.cash}}</div>
<div class="size-bole">{{orderStatistics.cash}}</div>
<div class="size-hui">
<div class="nei">现金</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
@ -147,7 +187,8 @@
</el-card>
<el-card class="box-card">
<div class="wgang">
<div>油品订单列表</div>
<!-- 油品订单列表-->
<div></div>
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelOilOrder()">导出订单</el-button>
</div>
@ -755,26 +796,59 @@
margin-bottom: 15px;
}
.box-gang{
width: 100%;
//width: 1920px;
display: flex;
align-items: center;
flex-wrap: wrap; /* 允许内容换行 */
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
}
.size-bole{
font-weight: bold;
.box{
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.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;
.nei {
width: 150px;
}
}
.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;
}
.wgang{
width: 100%;
display: flex;
@ -802,4 +876,18 @@
margin: 10px 0;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
</style>

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

@ -15,11 +15,11 @@
<!-- </div>-->
<!-- </div>-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.mtStaffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -27,11 +27,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="paymentType">
<el-form-item label="" prop="paymentType">
<el-select
v-model="queryParams.paymentType"
clearable
placeholder="全部"
placeholder="支付类型"
>
<el-option v-for="item in payList"
:key="item.id"
@ -40,10 +40,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号"></el-input>
<el-form-item label="">
<el-input v-model="queryParams.mobile" placeholder="手机号"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -58,17 +58,17 @@
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="开始日期">
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="结束日期">
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -82,32 +82,67 @@
<div class="box-gang">
<div class="box">
<div class="size-hui">充值笔数</div>
<div class="size-bole">{{orderStatistics.numberOfTopUps?orderStatistics.numberOfTopUps:0}}</div>
<div class="size-hui">
<div class="nei">充值笔数</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">充值总金额</div>
<div class="size-bole">{{orderStatistics.theTotalAmountOfTopUp?orderStatistics.theTotalAmountOfTopUp:0}}</div>
<div class="size-hui">
<div class="nei">充值总金额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">赠送总额</div>
<div class="size-bole">{{orderStatistics.theTotalAmountOfTheCredit?orderStatistics.theTotalAmountOfTheCredit:0}}</div>
<div class="size-hui">
<div class="nei">赠送总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">实收总额</div>
<div class="size-bole">{{orderStatistics.totalAmountReceived?orderStatistics.totalAmountReceived:0}}</div>
<div class="size-hui">
<div class="nei">实收总额</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">微信</div>
<div class="size-bole">{{orderStatistics.wechat?orderStatistics.wechat:0}}</div>
<div class="size-hui">
<div class="nei">微信</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">支付宝</div>
<div class="size-bole">{{orderStatistics.alipay?orderStatistics.alipay:0}}</div>
<div class="size-hui">
<div class="nei">支付宝</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">现金</div>
<div class="size-bole">{{orderStatistics.cash}}</div>
<div class="size-hui">
<div class="nei">现金</div>
<div class="icon-img">
<img src="../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</div>
@ -115,7 +150,8 @@
<!-- 表格-->
<el-card class="box-card">
<div class="wgang">
<div>会员充值列表</div>
<!-- 会员充值列表-->
<div></div>
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelVip()">导出订单</el-button>
</div>
@ -497,26 +533,52 @@ export default {
display: flex;
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: rgba(64,158,255,0.05);
height: 86px;
margin-right: 10px;
border-radius: 6px;
border: 1px solid #409EFF;
}
.size-hui{
font-size: 20px;
color: #555555;
font-weight: bold;
.box{
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.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;
.nei {
width: 150px;
}
.size-bole{
font-size: 14px;
color: #888888;
}
}
.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;
}
.wgang{
width: 100%;
display: flex;
@ -544,4 +606,17 @@ export default {
margin: 10px 0;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
</style>

6
fuintAdmin/src/views/setting/print/index.vue
View File

@ -2,17 +2,17 @@
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="设备名称" prop="name">
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入设备名称"
placeholder="设备名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>

BIN
fuintCashierWeb/src/assets/fonts/Source Han Sans CN Regular.otf Normal file
View File

Binary file not shown.

BIN
fuintCashierWeb/src/assets/fonts/YouSheBiaoTiHei.ttf Normal file
View File

Binary file not shown.

BIN
fuintCashierWeb/src/assets/images/cut/组 4666@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 729 B

8
fuintCashierWeb/src/assets/styles/fonts.css Normal file
View File

@ -0,0 +1,8 @@
@font-face {
font-family: 'YouSheBiaoTiHei';
src: url("../fonts/YouSheBiaoTiHei.ttf");
}
@font-face {
font-family: 'Source Han Sans CN';
src: url("../fonts/Source Han Sans CN Regular.otf");
}

6
fuintCashierWeb/src/assets/styles/fuint.scss
View File

@ -196,6 +196,12 @@
font-size: 13px;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.pull-right {
float: right !important;
}

2
fuintCashierWeb/src/main.js
View File

@ -33,7 +33,7 @@ import ImagePreview from "@/components/ImagePreview"
import VueMeta from 'vue-meta'
// 打印插件
import Print from 'vue-print-nb'
import '@/assets/styles/fonts.css';
// 全局方法挂载
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm

152
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -3,11 +3,11 @@
<div>
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
placeholder="交易员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
@ -15,10 +15,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
@ -43,7 +43,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
@ -54,43 +54,88 @@
<span>收银台订单统计</span>
</div>
<div class="box-gang">
<div class="box" style="display: flex;align-items: center;width: 250px">
<div>
<div class="size-hui">笔数</div>
<!-- <div class="box" style="display: flex;align-items: center;width: 250px">-->
<div class="box">
<div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
<div class="size-hui">
<div class="nei">笔数</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div style="margin-left: 30px">
<div class="size-hui" >油品笔数</div>
<div class="box">
<div class="size-bole">{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}</div>
<div class="size-hui">
<div class="nei">油品笔数</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div style="margin-left: 30px">
<div class="size-hui">商品笔数</div>
<div class="box">
<div class="size-bole">{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}</div>
<div class="size-hui">
<div class="nei">商品笔数</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<!-- </div>-->
<div class="box">
<div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
<div class="size-hui">
<div class="nei">订单总金额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">订单总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
</div>
<div class="box">
<div class="size-hui">实付总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}</div>
<div class="size-hui">
<div class="nei">实付总金额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">油品优惠</div>
<div class="size-bole">{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}</div>
<div class="size-hui">
<div class="nei">油品优惠</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">油品总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}</div>
<div class="size-hui">
<div class="nei">油品总金额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">商品总金额</div>
<div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
<div class="size-hui">
<div class="nei">商品总金额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
<div class="box">
<div class="size-hui">找零总金额</div>
<div class="size-bole">{{ seekZeroAmount }}</div>
<div class="size-hui">
<div class="nei">找零总金额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
</div>
</div>
</div>
@ -1223,22 +1268,67 @@ import {ifRefPassApi} from "@/api/staff/store";
width: 100%;
display: flex;
align-items: center;
flex-wrap: wrap; /* 允许内容换行 */
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
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;
.nei {
width: 150px;
}
}
.size-bole{
font-weight: bold;
//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;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
.wgang{
width: 100%;