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

9.27

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-09-27 09:23:47 +08:00
parent aebd7f67d3
commit b5ee5634d7
14 changed files with 568 additions and 1043 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin_zt/.env.development
View File

@ -11,11 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.31.95:8080/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
# cp端地址
# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'

2
fuintCashierWeb/.env.development
View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://127.0.0.1:8080/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
# http://192.168.0.121:8080/

18
fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
View File

@ -1,28 +1,11 @@
<template>
<div class="app-center">
<div class="tab-box">
<div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"
:key="index">
{{ item.name }}
</div>
</div>
<!-- <div class="app-top">-->
<!-- <el-card>-->
<!-- <el-radio-group v-model="radio1">-->
<!-- <el-radio-button label="收银台订单"></el-radio-button>-->
<!-- <el-radio-button label="油品交易订单"></el-radio-button>-->
<!-- <el-radio-button label="商品交易订单"></el-radio-button>-->
<!-- <el-radio-button label="会员充值订单"></el-radio-button>-->
<!-- &lt;!&ndash; <el-radio-button label="小程序交易订单"></el-radio-button>&ndash;&gt;-->
<!-- <el-radio-button label="挂账订单"></el-radio-button>-->
<!-- &lt;!&ndash; <el-radio-button label="未支付订单"></el-radio-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-radio-button label="积分兑换订单"></el-radio-button>&ndash;&gt;-->
<!-- </el-radio-group>-->
<!-- </el-card>-->
<!-- </div>-->
<!-- 收银台订单-->
<order_Cashier v-if="tabindex == 0 "></order_Cashier>
<!-- 油品订单-->
@ -99,7 +82,6 @@ export default {
<style scoped>
.app-center {
width: 100%;
box-sizing: border-box;
padding: 0;
margin: 0;

BIN
fuintCashierWeb/src/views/cashier/NewComponents/imgs/kbao.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 541 B

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

@ -5,20 +5,34 @@
<div class="o-top" v-if="userInfo">
<div style="width: 50%">
<div class="d-s">
<img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
<img src="./imgs/new_user.png" style="width: 32px;height: 32px;margin-right: 10px">
<div >
<div style="font-weight: bold">{{chooseVipUser.name||'匿名'}}</div>
<div style="font-weight: bold;margin-bottom: 2px">{{chooseVipUser.name||'匿名'}}</div>
<div class="d-s">
<span>{{chooseVipUser.mobile}}</span>
<img src="./imgs/fz.png" @click="copyToClipboard(chooseVipUser.mobile)" style="width: 17px;height: 17px;margin: 0px 10px">
<img src="./imgs/vipicon.png" style="width: 23px;height: 19px;">
<sapn style="margin: 0px 5px">普通会员</sapn>
<el-popover
placement="bottom"
trigger="click">
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
<img slot="reference" src="./imgs/kbao.png" style="width: 24px;height: 24px;margin-right: 10px">
</el-popover>
</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 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 class="d-s" style="width: 50%">
@ -31,15 +45,15 @@
<div class="left_input">
<el-autocomplete
v-model="userMobile"
style="width: 95%;margin: 15px "
style="width: 95%; "
:fetch-suggestions="getUser"
placeholder="请输入会员手机号"
>
<template slot-scope="{ item }">
<div class="name" @click="chooseUser(item)">{{ item.name+" "+item.mobile }}</div>
</template>
</el-autocomplete>
<i class="el-icon-search" style="font-size: 18px;margin-right: 10px" ></i>
</div>
<div class="d-s">
<div class="an_bor" @click="addVip()">新增会员</div>
@ -111,7 +125,7 @@
</div>
<div class="addbor">
<div class="">加油员</div>
<div class="or_num">0.00</div>
<div class="or_num">--</div>
</div>
</div>
<div class="er-box"></div>
@ -120,6 +134,7 @@
@click="setindex(item.dictValue)" :key="item.dictValue"
>{{ item.dictLabel }}
</div>
<div style="width: 31%"></div>
</div>
</div>
@ -132,6 +147,7 @@
<div class="anniu">立即结算</div>
</div>
</div>
<div class="cont-box">
<div class="box-top">
<div class="cont-tab">
@ -140,7 +156,7 @@
<div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div>
</div>
</div>
<div class="tab-kuang" style="flex-wrap: wrap">
<div class="tab-kuang" style="flex-wrap: wrap;justify-content: space-between ">
<div :class=item.classStyle v-for="(item,index) in dataList" @click="setRefuelingAmount(item)">
<div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
<div class="card-title">{{ item.gunName }}</div>
@ -152,15 +168,20 @@
</div>
<div class="c-bottom">
{{ getGoodsItem }}
</div>
<div class="bottom-b-d">
<!-- <div>订单笔数 <span style="color: #FF9655">0件</span></div>-->
<div>油品金额 <span style="color: #FF9655">￥{{ oilGunClearing.amount || 0.00 }}</span></div>
<div style=" position: absolute;bottom: 0px; width: 100%;">
<div class="c-bottom">
{{ getGoodsItem }}
</div>
<div class="bottom-b-d">
<!-- <div>订单笔数 <span style="color: #FF9655">0件</span></div>-->
<div>油品金额 <span style="color: #FF9655">￥{{ oilGunClearing.amount || 0.00 }}</span></div>
</div>
</div>
</div>
<div class="box-bottom">
<div class="anniu-c" @click="oilGunReset()">
重置
</div>
@ -188,6 +209,7 @@
<div class="goods_name">商品</div>
<div class="stock_name">库存</div>
<div class="u-price_name">单价</div>
<div class="u-price_name">会员价</div>
<div class="num_name">数量</div>
<div class="orerate_name">操作</div>
</div>
@ -199,15 +221,20 @@
</div>
<div class="stock_name">{{ item.stock }}</div>
<div class="u-price_name">{{ item.retailPrice }}</div>
<div class="num_name">{{ item.num }}</div>
<div class="u-price_name">{{ item.retailPrice }}</div>
<div class="num_name"> <el-input-number v-model="item.num" size="mini" :min="1" :max="999" label="描述文字"></el-input-number></div>
<div class="orerate_name">
<span style="color: red;cursor: pointer" @click="deleteGoods(item.id)">删除</span>
</div>
</div>
<div class="bottom-b-d">
<div>商品总数 <span style="color: #FF9655">{{ getGoodsListNum }}件</span></div>
<div>商品总金额 <span style="color: #FF9655">￥{{ getGoodsNum }}</span></div>
<div style=" position: absolute;bottom: 0px; width: 100%;">
<div class="bottom-b-d">
<div>商品总数 <span style="color: #FF9655">{{ getGoodsListNum }}件</span></div>
<div>商品总金额 <span style="color: #FF9655">￥{{ getGoodsNum }}</span></div>
</div>
</div>
</div>
<div class="box-bottom">
<div class="anniu-c" @click="goodsReset()">
@ -1448,8 +1475,9 @@ input {
width: 100%;
box-sizing: border-box;
height: 100vh;
padding: 20px 0px;
padding-right: 20px;
box-sizing: border-box;
padding: 20px ;
padding-bottom: 0px;
display: flex;
align-content: center;
@ -1479,14 +1507,14 @@ input {
}
.box-top {
height: 84vh;
height: 86vh;
background: #fff;
margin-bottom: 5px;
position: relative;
}
.box-bottom {
height: 12vh;
height: 10vh;
background: #fff;
z-index: 9;
box-sizing: border-box;
@ -1622,13 +1650,14 @@ input {
.wrap-box {
height: 190px;
display: flex;
position: absolute;
bottom: 0px;
width: 100%;
flex-wrap: wrap;
display: flex;
box-sizing: border-box;
padding: 20px;
justify-content: space-between ;
}
.f-box {
@ -1641,7 +1670,7 @@ input {
font-weight: 400;
font-size: 16px;
color: #555555;
margin-right: 2%;
margin-bottom: 2%;
border-radius: 10px;
border: 1px solid #409EFF;
@ -1651,7 +1680,7 @@ input {
.f-acvite {
background: #409eff !important;
color: #fff !important;
box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
//box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
}
.anniu {
@ -1749,7 +1778,7 @@ input {
}
.card92 {
width: 32%;
width: 31%;
height: 90px;
box-sizing: border-box;
padding: 5px;
@ -1761,13 +1790,13 @@ input {
font-size: 12px;
color: #FF9655;
overflow: hidden;
margin-right: 1%;
margin-bottom: 1%;
margin: 0 auto;
margin-bottom: 2%;
cursor: pointer;
}
.card0 {
width: 32%;
width: 31%;
height: 90px;
box-sizing: border-box;
padding: 5px;
@ -1779,12 +1808,12 @@ input {
font-size: 12px;
color: #FFB519;
overflow: hidden;
margin-right: 1%;
margin-bottom: 1%;
margin: 0 auto;
margin-bottom: 2%;
}
.card98 {
width: 32%;
width: 31%;
height: 90px;
box-sizing: border-box;
padding: 5px;
@ -1795,13 +1824,13 @@ input {
font-size: 12px;
color: #409EFF;
overflow: hidden;
margin-right: 1%;
margin-bottom: 1%;
margin: 0 auto;
margin-bottom: 2%;
cursor: pointer;
}
.card95 {
width: 32%;
width: 31%;
height: 90px;
box-sizing: border-box;
padding: 5px;
@ -1812,8 +1841,8 @@ input {
font-size: 12px;
color: #0DC291;
overflow: hidden;
margin-right: 1%;
margin-bottom: 1%;
margin: 0 auto;
margin-bottom: 2%;
cursor: pointer;
}
@ -1833,15 +1862,14 @@ input {
.c-bottom {
font-size: 14px;
color: #333333;
border-bottom: 2px solid #F4F5F9;
//border-bottom: 2px solid #F4F5F9;
box-sizing: border-box;
padding: 10px 20px;
}
.bottom-b-d {
position: absolute;
bottom: 0px;
width: 100%;
display: flex;
align-content: center;
@ -1850,6 +1878,7 @@ input {
padding: 10px 20px;
font-size: 16px;
color: #777777;
border-top: 2px solid #F4F5F9;
}
.anniu-c {
@ -1908,29 +1937,27 @@ input {
}
.goods_name {
width: 35%;
width: 25%;
}
.stock_name {
width: 15%;
width: 10%;
text-align: center;
}
.u-price_name {
width: 15%;
width: 10%;
text-align: center;
}
.num_name {
width: 15%;
width: 30%;
text-align: center;
}
.orerate_name {
width: 20%;
width: 15%;
text-align: center;
}
@ -2006,21 +2033,23 @@ input {
.left_input {
width: 70%;
overflow: hidden;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
padding: 10px 5px;
border-radius: 8px;
color: white;
border: 1px solid #fff;
::v-deep.el-input__inner {
background: transparent !important;
border: white 1px solid;
border: transparent 1px solid;
color: #fff;
.el-input__placeholder{
color: red;
color: #fff !important;
}
}

4
fuintCashierWeb/src/views/cashier/index.vue
View File

@ -711,7 +711,7 @@ export default {
color: #FF9655 !important;
}
.app-right{
width: 89% !important;
width: 90% !important;
}
//.bule1{
@ -719,7 +719,7 @@ export default {
// color: #81b0ff !important;
//}
.app-left{
width:180px;
width: 10% !important;
height: 100vh;
background: #ffffff;
box-shadow: 0 4px 4px 4px rgba(0,21,41,.08);

210
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -1,8 +1,8 @@
<!--增值交易订单-->
<template>
<div>
<div class="contenr_new">
<!-- 表单查询-->
<el-card class="box-card">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="returnType">
<el-select
@ -58,16 +58,16 @@
/>
</el-form-item>
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
<!-- size="medium"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="datetimerange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 400px"-->
<!-- size="medium"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="datetimerange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<el-date-picker
v-model="beginTime"
style="width: 160px"
@ -87,9 +87,9 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
<!-- 统计-->
<el-card class="box-card">
<div class="cont_new">
<div slot="header" class="clearfix">
<span>统计</span>
</div>
@ -141,102 +141,75 @@
</div>
</div>
</div>
</el-card>
</div>
<!-- 列表-->
<el-card class="box-card">
<div class="wgang">
<div></div>
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
</div>
<div class="bottom_new">
<div class="wgang">
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
</div>
<div class="table-box">
<el-table
:data="hangBillList"
style="width: 100%">
<!-- <el-table-column type="expand">-->
<!-- <template slot-scope="props">-->
<!-- <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">-->
<!-- <el-form-item label="操作人手机号">-->
<!-- <span>{{ props.row.mobile }}</span>-->
<!-- </el-form-item><br/>-->
<!-- <el-form-item label="更新时间">-->
<!-- <span>{{ props.row.updateTime ? props.row.updateTime:"&#45;&#45;" }}</span>-->
<!-- </el-form-item><br/>-->
<!-- <el-form-item label="单据备注">-->
<!-- <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
<!-- </el-form-item><br/>-->
<!-- <el-form-item label="单据金额">-->
<!-- <span>{{ props.row.amount ? props.row.amount:"0" }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="已还金额">-->
<!-- <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="未还金额">-->
<!-- <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
<el-table-column align="center" label="挂账单位">
<el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
<el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
<el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
</el-table-column>
<el-table-column label="记录明细" align="center">
<el-table-column prop="returnType" align="center" label="类型">
<template slot-scope="scope">
<el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
<el-tag v-else type="success">归还</el-tag>
</template>
</el-table-column>
<el-table-column prop="amount" align="center" label="金额"> </el-table-column>
<el-table-column prop="status" align="center" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.status == 0">未归还</span>
<span v-else-if="scope.row.status == 1" type="success">已归还</span>
<span v-else type="success">部分归还</span>
</template>
</el-table-column>
<el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
<el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
</el-table-column>
<el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间" width="220">
</div>
<div class="table-box">
<el-table
:data="hangBillList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
<el-table-column align="center" label="挂账单位">
<el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
<el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
<el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
</el-table-column>
<el-table-column label="记录明细" align="center">
<el-table-column prop="returnType" align="center" label="类型">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
<el-tag v-else type="success">归还</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column prop="amount" align="center" label="金额"> </el-table-column>
<el-table-column prop="status" align="center" label="状态">
<template slot-scope="scope">
<el-button
v-if="scope.row.status != 0"
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情</el-button>
<span v-if="scope.row.status == 0">未归还</span>
<span v-else-if="scope.row.status == 1" type="success">已归还</span>
<span v-else type="success">部分归还</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
<el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
<el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
</el-table-column>
<el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间" width="220">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-card>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="scope.row.status != 0"
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div>
<!-- 归还记录信息-->
<el-drawer
@ -540,6 +513,10 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
align-items: center;
flex-wrap: wrap;
}
.contenr_new{
box-sizing: border-box;
//padding: 10px;
}
.box{
//box-sizing: border-box;
padding: 5px;
@ -574,15 +551,11 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
}
}
.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;
@ -625,11 +598,36 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(255,150,85,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #FF9655;
}
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
.cont_new{
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
.bottom_new{
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
</style>

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

@ -1,63 +1,66 @@
<!-- 收银台订单-->
<template>
<div>
<div class="cot-box">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择操作人"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
</el-form-item>
<el-form-item label="">
<div class="top_new" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="0px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择操作人"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
</el-date-picker>
</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-button type="primary" @click="exportExcelCashier()">导出</el-button>
</el-form-item>
</el-form>
<el-date-picker
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item >
</el-form-item>
</el-form>
<div style="display: flex; height: 32px;">
<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="exportExcelCashier()">导出</el-button>
</div>
</div>
<div class="cot-box">
<div>
<div class="box-gang">
<div class="box2">
@ -109,91 +112,6 @@
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">商品订单/实付总金额（元）</div>
</div>
</div>
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <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/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <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/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ seekZeroAmount }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">找零总金额</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <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/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <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/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
@ -201,9 +119,10 @@
<div class="table-box">
<el-table
:data="orderList"
size="mini"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="订单号" width="220"></el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" ></el-table-column>
<el-table-column prop="amount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="afterDiscountAmount" align="center" label="优惠金额（元）"></el-table-column>
<el-table-column prop="afterDiscountAmount" align="center" label="应收金额（元）"></el-table-column>
@ -235,7 +154,7 @@
</el-table-column>
</el-table-column>
<el-table-column prop="payUser" align="center" label="付款用户" width="110"></el-table-column>
<el-table-column prop="payUser" align="center" label="付款用户" ></el-table-column>
<el-table-column prop="status" align="center" label="支付方式">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
@ -252,19 +171,19 @@
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column prop="payUser" align="center" label="关联员工" width="110"></el-table-column>
<el-table-column prop="payUser" align="center" label="关联员工" ></el-table-column>
<el-table-column label="操作人" align="center" prop="staffId">
<template slot-scope="scope">
<span>{{ getRealName(staffList, scope.row.staffId) || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="订单完成时间" align="center" width="160" prop="payTime">
<el-table-column label="订单完成时间" align="center" prop="payTime">
<template slot-scope="scope">
<span>{{ scope.row.payTime ? parseTime(scope.row.payTime) : "--" }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="color: #fe8c4a" size="mini"
@click="getOrdersInfo(scope.row.id)"
@ -290,9 +209,8 @@
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
layout="prev, pager, next, jumper"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@ -1598,7 +1516,7 @@ export default {
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui {
@ -1651,8 +1569,7 @@ export default {
.table-box {
width: 100%;
height: 60vh;
overflow: auto;
}
.pagination-box {
@ -1660,7 +1577,7 @@ export default {
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
justify-content: flex-end;
}
.top-app-sou {
@ -1679,5 +1596,17 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
min-height: 82vh;
}
.top_new{
display: flex;
justify-content: space-between;
height: 65px;
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
</style>

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

@ -1,75 +1,74 @@
<!--商品交易列表-->
<template>
<div>
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择关联员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
placeholder="请选择订单类型"
clearable
style="width: 240px"
>
<el-option
v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入付款用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item >
<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="exportExcelGoodsOrder()">导出</el-button>
</el-form-item>
</el-form>
</div>
<div class="cot-box">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="85px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择关联员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
placeholder="请选择订单类型"
clearable
style="width: 240px"
>
<el-option
v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入付款用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</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-button type="primary" @click="exportExcelGoodsOrder()">导出</el-button>
</el-form-item>
</el-form>
</div>
<div>
<div class="box-gang">
<div class="box2">
@ -129,98 +128,16 @@
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">现金（元）</div>
</div>
</div>
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.wechat }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">微信</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.alipay }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">支付宝</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.cash }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">现金</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div>
<!-- <div class="wgang">-->
<!-- <div></div>-->
<!-- <div style="display: flex ">-->
<!-- <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelGoodsOrder()">导出订单-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </div>-->
<div class="table-box">
<el-table
:data="list"
style="width: 100%">
<!-- <el-table-column type="expand">-->
<!-- <template slot-scope="props">-->
<!-- <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
<!-- <el-form-item label="收银员">-->
<!-- <span>{{ queryStaf(staffList,props.row.staffId) }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="来源终端">-->
<!-- <span>{{ getVal(terminalList,props.row.terminal) }}</span>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="订单ID" prop="id" width="80"/>-->
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="220"/>
<el-table-column label="订单类型" align="center" prop="terminal"/>
@ -905,10 +822,6 @@ export default {
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui {
display: flex;
align-items: center;
@ -959,6 +872,7 @@ export default {
.table-box {
width: 100%;
min-height: 80px;
}
.pagination-box {
@ -1011,4 +925,18 @@ export default {
padding: 20px;
margin: 0 auto;
}
.el-form--inline .el-form-item {
margin-right: 30px;
}
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
</style>

241
fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
View File

@ -9,138 +9,6 @@
</el-alert>
<points-mall></points-mall>
<!-- <div class="top-dis">-->
<!-- <div class="top-app-sou">-->
<!-- <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
<!-- <el-form-item label="名称">-->
<!-- <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- <div style="margin-left: 10px">-->
<!-- <el-button type="primary" icon="el-icon-search">查询</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!--&lt;!&ndash; 列表&ndash;&gt;-->
<!-- <div class="bottom-dis">-->
<!-- <div class="wgang">-->
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="全部订单" name="first"></el-tab-pane>-->
<!-- <el-tab-pane name="first1">-->
<!-- <div slot="label" class="hgang"> 待处理/待发货 <span class="hongdian">1</span> </div>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane name="first2">-->
<!-- <div slot="label" class="hgang"> 已完成/已发货 <span class="hongdian">1</span> </div>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane name="first3">-->
<!-- <div slot="label" class="hgang"> 已拒绝/已退款 <span class="hongdian">1</span> </div>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane name="first4">-->
<!-- <div slot="label" class="hgang"> 未付款订单 <span class="hongdian">1</span> </div>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
<!-- </div>-->
<!-- <div class="table-box">-->
<!-- <el-table-->
<!-- :data="tableData"-->
<!-- style="width: 100%">-->
<!-- <el-table-column type="expand">-->
<!-- <template slot-scope="props">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-form-item label="名称">-->
<!-- <span>{{ props.row.name }}</span>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="date"-->
<!-- label="用户信息"-->
<!-- width="150">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="余额">-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="电子储值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="升值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="会员等级">-->
<!-- <el-table-column-->
<!-- prop="province"-->
<!-- label="汽油"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="柴油"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="天然气"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="统计">-->
<!-- <el-table-column-->
<!-- prop="province"-->
<!-- label="加油金"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="积分"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="消费次数"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zip"-->
<!-- label="实体卡号"-->
<!-- width="220">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zip"-->
<!-- label="状态"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- >更多操作</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <div class="pagination-box">-->
<!-- <el-pagination-->
<!-- background-->
<!-- layout="prev, pager, next"-->
<!-- :total="1000">-->
<!-- </el-pagination>-->
<!-- </div>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="积分收银台订单">
<el-alert
@ -150,115 +18,6 @@
<points-cashier></points-cashier>
<!-- <div class="bottom-dis">-->
<!-- <div slot="header" class="clearfix">-->
<!-- <span>统计</span>-->
<!-- </div>-->
<!-- <div class="box-gang">-->
<!-- <div class="box" v-for="(item,index) in 7" :key="index">-->
<!-- <div class="size-hui">订单总数</div>-->
<!-- <div class="size-bole">55</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="table-box">-->
<!-- <el-table-->
<!-- :data="tableData"-->
<!-- style="width: 100%">-->
<!-- <el-table-column type="expand">-->
<!-- <template slot-scope="props">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-form-item label="名称">-->
<!-- <span>{{ props.row.name }}</span>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="date"-->
<!-- label="用户信息"-->
<!-- width="150">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="余额">-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="电子储值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="升值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- -->
<!-- </el-table-column>-->
<!-- <el-table-column label="会员等级">-->
<!-- <el-table-column-->
<!-- prop="province"-->
<!-- label="汽油"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="柴油"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="天然气"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="统计">-->
<!-- <el-table-column-->
<!-- prop="province"-->
<!-- label="加油金"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="积分"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="city"-->
<!-- label="消费次数"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- -->
<!-- <el-table-column-->
<!-- prop="zip"-->
<!-- label="实体卡号"-->
<!-- width="220">-->
<!-- </el-table-column>-->
<!-- -->
<!-- <el-table-column-->
<!-- prop="zip"-->
<!-- label="状态"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- >更多操作</el-button>-->
<!-- -->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- -->
<!-- </el-table>-->
<!-- </div>-->
<!-- <div class="pagination-box">-->
<!-- <el-pagination-->
<!-- background-->
<!-- layout="prev, pager, next"-->
<!-- :total="1000">-->
<!-- </el-pagination>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>

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

@ -2,109 +2,109 @@
<template>
<div>
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择操作人">
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
</el-form-item>
<el-form-item label="" prop="terminal">
<el-select
v-model="queryParams.terminal"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in terminalList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="请选择油品油号"
>
<el-option v-for="item in oilGunList"
:key="item.id"
:label="item.gunName"
:value="item.id">
<span style="float: left">{{ item.oilName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="请选择油枪"
>
<el-option v-for="item in oilGunList"
:key="item.id"
:label="item.gunName"
:value="item.id">
<span style="float: left">{{ item.oilName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
<el-option label="电子囤油卡" value="oilCard"/>
<el-option label="电子电子储值卡" value="balance"/>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
</el-date-picker>
</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-button type="primary" @click="exportExcelOilOrder()">导出</el-button>
</el-form-item>
</el-form>
</div>
<div class="cot-box">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="请选择操作人"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
</el-form-item>
<el-form-item label="" prop="terminal">
<el-select
v-model="queryParams.terminal"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in terminalList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="请选择油品油号"
>
<el-option v-for="item in oilGunList"
:key="item.id"
:label="item.gunName"
:value="item.id">
<span style="float: left">{{ item.oilName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="请选择油枪"
>
<el-option v-for="item in oilGunList"
:key="item.id"
:label="item.gunName"
:value="item.id">
<span style="float: left">{{ item.oilName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
<el-option label="电子囤油卡" value="oilCard"/>
<el-option label="电子电子储值卡" value="balance"/>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="结束日期">
</el-date-picker>
</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-button type="primary" @click="exportExcelOilOrder()">导出</el-button>
</el-form-item>
</el-form>
</div>
<div>
<div class="box-gang">
<div class="box2">
@ -175,88 +175,15 @@
</div>
</div>
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <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" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <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/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.wechat }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">微信</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.alipay }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">支付宝</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="box1">-->
<!-- <div class="size-bole">{{ orderStatistics.cash }}</div>-->
<!-- <div class="size-hui">-->
<!-- <div class="nei">现金</div>-->
<!-- <div class="icon-img">-->
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div>
<div style="height: 60vh;overflow: auto">
<div class="new_bottom">
<div>
<el-table
v-loading="loading"
border
:data="oilOrderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="订单号" width="220"></el-table-column>
<el-table-column prop="terminal" label="订单类型" align="center" width="80">
@ -264,12 +191,12 @@
<span>{{ getVal(terminalList, props.row.terminal) }}</span>
</template>
</el-table-column>
<el-table-column prop="oilGunNum" label="油品/油号" align="center" width="90">
<el-table-column prop="oilGunNum" label="油品/油号" align="center" >
<template slot-scope="props">
<span>{{ getName(oilNameList, props.row.oils) }}</span>
</template>
</el-table-column>
<el-table-column prop="oilGunNum" label="油枪" align="center" width="90">
<el-table-column prop="oilGunNum" label="油枪" align="center" >
<template slot-scope="props">
<span>{{ getName1(oilGunList, props.row.oilGunNum) }}</span>
</template>
@ -278,9 +205,9 @@
<el-table-column prop="discountAmount" label="优惠金额（元）" align="center"></el-table-column>
<el-table-column prop="payAmount" label="实付金额（元）" align="center"></el-table-column>
<el-table-column prop="balanceAmount" label="储值卡付款金额（元）" align="center" width="115"/>
<el-table-column prop="oilCardAmount" label="囤油卡付款金额（元）" align="center" width="115"/>
<el-table-column prop="payUser" label="付款用户" align="center" width="110"></el-table-column>
<el-table-column prop="balanceAmount" label="储值卡付款金额（元）" align="center" />
<el-table-column prop="oilCardAmount" label="囤油卡付款金额（元）" align="center" />
<el-table-column prop="payUser" label="付款用户" align="center" ></el-table-column>
<el-table-column prop="payType" label="支付方式" align="center">
<template slot-scope="scope">
<span>{{ getType(payList, scope.row.payType) }}</span>
@ -289,7 +216,7 @@
<span v-if="scope.row.payType=='credit'">挂账</span>
</template>
</el-table-column>
<el-table-column prop="orderStatus" label="订单状态" align="center" width="120">
<el-table-column prop="orderStatus" label="订单状态" align="center" >
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus === 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus === 'paid'">已支付</el-tag>
@ -305,13 +232,13 @@
</el-table-column>
<el-table-column prop="orderType" label="关联员工" align="center"></el-table-column>
<el-table-column prop="orderType" label="操作人" align="center"></el-table-column>
<el-table-column label="订单完成时间" align="center" width="160" prop="payTime">
<el-table-column label="订单完成时间" align="center" prop="payTime">
<template slot-scope="scope">
<span>{{ scope.row.payTime ? parseTime(scope.row.payTime) : "--" }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button style="color: #fe8c4a" @click="patchwork(scope.row)" type="text">补打
</el-button>
@ -326,9 +253,8 @@
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
layout="prev, pager, next, jumper"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@ -360,7 +286,6 @@
<!-- 订单退款-->
<el-dialog
:close-on-click-modal="false"
title="订单退款"
width="25%"
:visible.sync="dialogRefund">
@ -1068,7 +993,7 @@ export default {
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
justify-content: flex-end;
}
.top-app-sou {
@ -1113,4 +1038,19 @@ export default {
padding: 20px;
margin: 0 auto;
}
.top_new{
display: flex;
justify-content: space-between;
height: 120px;
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
margin-bottom: 10px;
}
.new_bottom{
min-height: 80vh;
}
</style>

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

@ -638,6 +638,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
}
.table-box{
width: 100%;
min-height: 80vh;
}
.pagination-box{
width: 100%;
@ -645,6 +646,7 @@ import {connectFlag, getLodop} from "@/api/LodopFuncs";
display: flex;
align-items: center;
justify-content: center;
}
.top-app-sou{
width: 20%;

181
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -1,72 +1,76 @@
<!--会员充值订单-->
<template>
<div>
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.mtStaffId"
clearable
placeholder="请选择关联员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
<el-select
v-model="queryParams.paymentType"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
<el-select
v-model="queryParams.paymentType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item >
<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="exportExcelVip()">导出</el-button>
</el-form-item>
</el-form>
</div>
<div class="cot-box">
<!-- 条件查询-->
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="staffId">
<el-select
v-model="queryParams.mtStaffId"
clearable
placeholder="请选择关联员工"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
<el-select
v-model="queryParams.paymentType"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
<el-select
v-model="queryParams.paymentType"
clearable
placeholder="请选择支付方式"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</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-button type="primary" @click="exportExcelVip()">导出</el-button>
</el-form-item>
</el-form>
</div>
<!-- 统计-->
<div>
@ -668,7 +672,6 @@ export default {
<style scoped>
.app-top {
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
@ -703,9 +706,6 @@ export default {
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}
.size-hui {
display: flex;
@ -723,37 +723,7 @@ export default {
}
}
.size-bole {
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
text-align: left;
font-style: normal;
text-transform: none;
}
.icon-img {
width: 20px;
height: 20px;
margin-right: 5px;
img {
float: right;
width: 20px;
height: 20px;
}
}
.wgang {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box {
width: 100%;
@ -767,15 +737,14 @@ export default {
justify-content: center;
}
.top-app-sou {
width: 20%;
}
.tk {
text-align: center;
color: grey;
margin: 10px 0;
}
.el-form--inline .el-form-item {
margin-right: 4px !important;
}
.box1 {
padding: 5px;
@ -809,4 +778,14 @@ export default {
padding: 20px;
margin: 0 auto;
}
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
}
</style>

16
gasStation-uni/.hbuilderx/launch.json
View File

@ -1,16 +0,0 @@
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}