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

bug

Browse Source
This commit is contained in:
cun-nan 2024-02-04 18:08:43 +08:00
parent 033a66f12d
commit 9f5d333798
26 changed files with 1585 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
fuintAdmin/src/api/order/hangbill.js Normal file
View File

@ -0,0 +1,98 @@
import request from '@/utils/request'
// 查询挂账信息列表
export function listHangBill(query) {
return request({
url: '/business/hangBill/list',
method: 'get',
params: query
})
}
// 查询挂账信息列表
export function hangBillInfo(id) {
return request({
url: '/business/hangBill/'+id,
method: 'get',
})
}
// 查询所有挂账信息列表
export function hangBills() {
return request({
url: '/business/hangBill/hangBills',
method: 'get',
})
}
// 新增挂账记录
export function addHangBill(data) {
return request({
url: '/business/hangBill',
method: 'post',
data: data
})
}
// 批量归还挂账信息
export function batchHangBill(data) {
return request({
url: '/business/hangBill/batch',
method: 'post',
data: data
})
}
// 根据订单号查询挂账记录信息
export function queryHangBill(data) {
return request({
url: '/business/hangBill/orderNo',
method: 'post',
data: data
})
}
// 修改挂账记录及收款
export function editHangBill(data) {
return request({
url: '/business/hangBill',
method: 'put',
data: data
})
}
// 当前店铺归还账单的数量
export function hangBillReturnTotal(query) {
return request({
url: '/business/hangBill/returnTotal',
method: 'get',
params: query
})
}
// 当前店铺归还账单的数量
export function hangBillAllAmount(query) {
return request({
url: '/business/hangBill/allAmount',
method: 'get',
params: query
})
}
// 当前店铺归还账单的数量
export function hangBillAllReturnAmount(query) {
return request({
url: '/business/hangBill/allReturnAmount',
method: 'get',
params: query
})
}
// 当前店铺归还账单的数量
export function hangBillAllNoReturnAmount(query) {
return request({
url: '/business/hangBill/allNoReturnAmount',
method: 'get',
params: query
})
}

27
fuintAdmin/src/api/order/returnrecord.js Normal file
View File

@ -0,0 +1,27 @@
import request from '@/utils/request'
// 根据挂账记录id查询归还记录信息
export function listReturnRecord(query) {
return request({
url: '/business/returnRecord/list',
method: 'get',
params: query
})
}
// 根据id查询挂账归还信息
export function returnRecordInfo(id) {
return request({
url: '/business/returnRecord/' + id,
method: 'get',
})
}
// 根据订单号查询挂账归还信息
export function returnRecordByOrderNo(data) {
return request({
url: '/business/returnRecord/order',
method: 'post',
data: data
})
}

76
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -8,7 +8,7 @@
</el-tabs> </el-tabs>
<el-form-item label="商品分类" prop="cvsGoodId"> <el-form-item label="商品分类" prop="cvsGoodId">
<el-select <el-select
v-model="form.cvsGoodId" v-model="queryParams.cvsGoodId"
placeholder="全部" placeholder="全部"
clearable clearable
style="width: 300px" style="width: 300px"
@ -73,12 +73,14 @@
clearable clearable
style="width: 240px" style="width: 240px"
> >
<el-option <!-- <el-option-->
v-for="dict in dict.type.zhzt" <!-- v-for="dict in dict.type.zhzt"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="dict.label" <!-- :label="dict.label"-->
:value="dict.value" <!-- :value="dict.value"-->
/> <!-- />-->
<el-option label="上架" value="qy"/>
<el-option label="下架" value="jy"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -263,7 +265,15 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="8">
<el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">
<el-radio-group v-model="form.canUseExchange">
<el-radio label="0">是</el-radio>
<el-radio label="1">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="初始库存" prop="stock"> <el-form-item label="初始库存" prop="stock">
<el-input v-model="form.stock" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="true" placeholder="0"/> <el-input v-model="form.stock" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="true" placeholder="0"/>
</el-form-item> </el-form-item>
@ -403,7 +413,7 @@ export default {
// 表单参数 // 表单参数
form: { form: {
id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"", id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"",
unit:'',shelfNumber:'',canUsePoint:'no',stock:0,supplierId:'',sort:0,status:'qy' unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy'
}, },
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
@ -603,11 +613,11 @@ export default {
// 搜索按钮操作 // 搜索按钮操作
handleQuery() { handleQuery() {
this.queryParams.page = 1; this.queryParams.page = 1;
if (this.cvsGoodId.length==1){ // if (this.cvsGoodId.length==1){
this.queryParams.cvsGoodId = this.cvsGoodId[0] // this.queryParams.cvsGoodId = this.cvsGoodId[0]
}else { // }else {
this.queryParams.cvsGoodId = this.cvsGoodId[1] // this.queryParams.cvsGoodId = this.cvsGoodId[1]
} // }
this.getList(); this.getList();
}, },
// 重置按钮操作 // 重置按钮操作
@ -622,7 +632,7 @@ export default {
this.resetForm("form"); this.resetForm("form");
this.form= { this.form= {
id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"", id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"",
unit:'',shelfNumber:'',canUsePoint:'no',stock:0,supplierId:'',sort:0,status:'qy' unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy'
} }
}, },
// 是否移至回收站 // 是否移至回收站
@ -665,20 +675,20 @@ export default {
const id = row.id; const id = row.id;
getLJGoods(id).then(response => { getLJGoods(id).then(response => {
this.form = response.data; this.form = response.data;
this.cvsGoodOptions.forEach(item => { // this.cvsGoodOptions.forEach(item => {
if (item.value == response.data.cvsGoodId){ // if (item.value == response.data.cvsGoodId){
this.cvsGoodId.push(item.value) // this.cvsGoodId.push(item.value)
}else { // }else {
if (item.children.length>0){ // if (item.children.length>0){
item.children.forEach(i => { // item.children.forEach(i => {
if (i.value == response.data.cvsGoodId){ // if (i.value == response.data.cvsGoodId){
this.cvsGoodId.push(item.value) // this.cvsGoodId.push(item.value)
this.cvsGoodId.push(i.value) // this.cvsGoodId.push(i.value)
} // }
}) // })
} // }
} // }
}) // })
this.supplierList.forEach(item => { this.supplierList.forEach(item => {
if (item.id == response.data.supplierId){ if (item.id == response.data.supplierId){
this.supplier = item.name this.supplier = item.name
@ -710,10 +720,10 @@ export default {
} }
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.stock==0){ // if (this.form.stock==0){
this.$modal.msgError("库存不可为0"); // this.$modal.msgError("库存不可为0");
return; // return;
} // }
if (this.form.id) { if (this.form.id) {
updateLJGoods(this.form).then(response => { updateLJGoods(this.form).then(response => {
this.$modal.msgSuccess("商品信息更新成功"); this.$modal.msgSuccess("商品信息更新成功");

18
fuintAdmin/src/views/convenienceStore/index.vue
View File

@ -203,15 +203,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110"> <!-- <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
<el-radio-group v-model="form1.canUsePoint"> <!-- <el-radio-group v-model="form1.canUsePoint">-->
<el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio> <!-- <el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="供应商" prop="supplierId"> <el-form-item label="供应商" prop="supplierId">

6
fuintAdmin/src/views/member/creditIndex.vue
View File

@ -135,7 +135,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="预设挂账额度" prop="creditLimit"> <el-form-item label="预设挂账额度" prop="creditLimit">
<el-input v-model="form1.creditLimit" @input="changeCreditAmount" placeholder="请输入挂账额度，为0则不限额" maxlength="30"> <el-input v-model="form1.creditLimit" @input="changeCreditAmount" placeholder="请输入预设挂账额度" maxlength="10">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
<span style="font-size: 12px;color: grey"> <span style="font-size: 12px;color: grey">
@ -147,7 +147,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="已使用挂账额度" prop="creditLimit"> <el-form-item label="已使用挂账额度" prop="creditLimit">
<el-input v-model="form1.usedCreditLimit" disabled placeholder="0" maxlength="30"> <el-input v-model="form1.usedCreditLimit" disabled placeholder="0" maxlength="10">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
<span style="font-size: 12px;color: grey"> <span style="font-size: 12px;color: grey">
@ -159,7 +159,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="剩余挂账额度" prop="creditLimit"> <el-form-item label="剩余挂账额度" prop="creditLimit">
<el-input v-model="form1.residueCreditLimit" disabled placeholder="0" maxlength="30"> <el-input v-model="form1.residueCreditLimit" disabled placeholder="0" maxlength="10">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
<span style="font-size: 12px;color: grey"> <span style="font-size: 12px;color: grey">

490
fuintAdmin/src/views/order/order_Added.vue Normal file
View File

@ -0,0 +1,490 @@
<!--增值交易订单-->
<template>
<div>
<!-- 表单查询-->
<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-select
v-model="queryParams.returnType"
clearable
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-select
v-model="queryParams.status"
placeholder="全部"
clearable
>
<el-option label="未归还" value="0"></el-option>
<el-option label="已归还" value="1"></el-option>
<el-option label="部分归还" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="单位名称" prop="unitName">
<el-input
v-model="queryParams.unitName"
placeholder="请输入挂账单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="挂账人" prop="personCredit">
<el-input
v-model="queryParams.personCredit"
placeholder="请输入挂账人名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系电话" prop="contactMobile">
<el-input
v-model="queryParams.contactMobile"
placeholder="请输入挂账人联系电话"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人手机号" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入操作人手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
size="medium"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-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-form-item>
</el-form>
</el-card>
<!-- 统计-->
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>统计</span>
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">挂账笔数</div>
<div class="size-bole">{{ total }}</div>
</div>
<div class="box">
<div class="size-hui">挂账总额</div>
<div class="size-bole">{{ allAmount }}</div>
</div>
<div class="box">
<div class="size-hui">归还笔数</div>
<div class="size-bole">{{ returnTotal }}</div>
</div>
<div class="box">
<div class="size-hui">归还总额</div>
<div class="size-bole">{{ returnAllAmount }}</div>
</div>
<div class="box">
<div class="size-hui">未还金额</div>
<div class="size-bole">{{ noReturnAllAmount }}</div>
</div>
</div>
</el-card>
<!-- 列表-->
<el-card class="box-card">
<div class="wgang">
<div>挂账订单列表</div>
<div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus">导出订单</el-button>
</div>
</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:"--" }}</span>
</el-form-item><br/>
<el-form-item label="单据备注">
<span>{{ props.row.remark ? props.row.remark:"--" }}</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 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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</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"
@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>
</el-card>
<!-- 归还记录信息-->
<el-drawer
title="归还详情"
:visible.sync="drawer"
direction="rtl"
size="55%"
:before-close="handleClose">
<div style="display: grid; place-items: center;">
<el-card style="background-color: #f5f5f5;width: 90%">
<div slot="header" class="clearfix">
<div style="position: relative;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
<h2>单据号：{{record.orderNo}}</h2>
</div>
</div>
<br>
<div style="display: flex; justify-content: space-between;">
<span>操作员工：</span>
<span>{{ record.realName }}</span>
</div>
</div>
<div >
<div style="display: flex; justify-content: space-between;">
<span>挂账单位</span>
<span>{{record.unitName}}</span>
</div>
<div style="display: flex; justify-content: space-between;margin: 10px 0">
<span>挂账人</span>
<span>{{record.personCredit}}</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span>联系电话</span>
<span>{{record.contactMobile}}</span>
</div>
</div>
</el-card>
<el-card style="margin-top: 15px;width: 90%">
<el-table ref="tables"
v-loading="loading"
:data="returnRecordList">
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
<el-table-column label="类型" align="center" prop="returnType">
<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 label="归还金额" align="center" prop="amount" />
<el-table-column label="找零金额" align="center" prop="seekZero" />
<el-table-column label="归还方式" align="center" prop="status">
<template slot-scope="scope">
<span>{{ getPayMeth(payList,scope.row.status) }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus">
<template slot-scope="scope">
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="realName" />
<el-table-column label="支付时间" align="center" prop="payTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@current-change="getRecordList">
</el-pagination>
</div>
</el-card>
</div>
</el-drawer>
</div>
</template>
<script>
import {
hangBillAllAmount,
hangBillAllNoReturnAmount,
hangBillAllReturnAmount, hangBillInfo, hangBillReturnTotal,
listHangBill
} from "@/api/order/hangbill";
import {getDicts} from "@/api/order/data";
import {listReturnRecord} from "@/api/order/returnrecord";
export default {
name: "order_Cashier",
data(){
return{
queryParams1: {
page: 1,
pageSize: 10,
hangBillId:"",
},
hangBillList:[],
total:0,
total2:0,
loading:false,
queryParams:{
page:1,
pageSize:10,
returnType:"",
status:"",
unitName:"",
personCredit:"",
contactMobile:"",
mobile:"",
},
dateRange:[],
returnRecordList:[],
payList:[],
// 归还账单总数
returnTotal:0,
// 挂账总额
allAmount:0,
// 归还总额
returnAllAmount:0,
// 未归还总额
noReturnAllAmount:0,
drawer:false,
// 挂账信息
record:{},
}
},
created() {
this.getList()
this.getPayList()
},
methods: {
// 归还记录详情弹框
returnRecord(id){
this.record = {}
this.drawer = true
hangBillInfo(id).then(response => {
this.record = response.data
})
this.getRecordList(id,1);
},
getRecordList(id,val){
if (val!=1){
this.queryParams1.page = id
this.queryParams1.hangBillId = this.record.id
}else {
this.queryParams1.hangBillId = id
}
listReturnRecord(this.queryParams1).then(response => {
this.returnRecordList = response.data.records
this.total2 = response.data.total
})
},
// 获取支付方式
getPayList() {
getDicts("payment_type").then(response => {
this.payList = response.data;
})
},
getPayMeth(list,val){
let name = "";
if (list!=null && list!=""){
list.forEach(item => {
if (item.dictValue == val){
name = item.dictLabel
}
})
}
return name;
},
// 是否关闭弹框
handleClose(done) {
done();
},
getList(val){
if (val!=undefined){
this.queryParams.page = val
}
listHangBill(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.hangBillList = response.data.records
this.total = response.data.total;
})
this.getStatistic();
},
// 获取挂账统计信息
getStatistic(){
hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.returnTotal = res.data
})
hangBillAllAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.allAmount = res.data
}
})
hangBillAllReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.returnAllAmount = res.data
}
})
hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.noReturnAllAmount = res.data
}
})
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams.page = 1;
this.resetForm("queryForm");
this.handleQuery();
},
}
}
</script>
<style scoped>
.app-top{
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix{
width: 100%;
}
.box-card{
width: 100%;
margin-bottom: 15px;
}
.box-gang{
width: 100%;
display: flex;
align-items: center;
}
.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;
}
.wgang{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box{
width: 100%;
}
.pagination-box{
width: 100%;
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
}
.top-app-sou{
width: 20%;
}
</style>

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

@ -141,54 +141,51 @@
<el-table <el-table
:data="oilOrderList" :data="oilOrderList"
style="width: 100%"> style="width: 100%">
<el-table-column type="expand"> <!-- <el-table-column type="expand">-->
<template slot-scope="props"> <!-- <template slot-scope="props">-->
<el-form label-position="left" class="demo-table-expand" style="margin-left: 20px"> <!-- <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
<el-form-item label="用户信息"> <!-- <el-form-item label="用户信息">-->
<span>{{ props.row.userId ? queryUser(userList,props.row.userId):"--" }}</span> <!-- <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"&#45;&#45;" }}</span>-->
</el-form-item>
<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-item label="用户评价">
<span>{{ props.row.remark ? props.row.remark:"--" }}</span>
</el-form-item>
<!-- <el-form-item label="订单备注">-->
<!-- <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
<!-- <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> <!-- <el-form-item label="收银员">-->
</template> <!-- <span>{{ queryStaf(staffList,props.row.staffId) }}</span>-->
</el-table-column> <!-- </el-form-item>-->
<!-- <el-form-item label="来源终端">-->
<!-- <span>{{ getVal(terminalList,props.row.terminal) }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户评价">-->
<!-- <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="订单备注">&ndash;&gt;-->
<!--&lt;!&ndash; <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>&ndash;&gt;-->
<!--&lt;!&ndash; <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>&ndash;&gt;-->
<!--&lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column prop="terminal" label="终端" align="center" width="80"> <el-table-column prop="terminal" label="终端" align="center" width="80">
<template slot-scope="props"> <template slot-scope="props">
<span>{{ getVal(terminalList,props.row.terminal) }}</span> <span>{{ getVal(terminalList,props.row.terminal) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column> <el-table-column prop="orderNo" label="订单号" align="center" width="220"> </el-table-column>
<el-table-column label="订单信息" align="center"> <el-table-column label="订单信息" align="center">
<el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120"> <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="90">
<template slot-scope="props"> <template slot-scope="props">
<span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span> <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderAmount" label="订单金额" align="center" width="120"> </el-table-column> <el-table-column prop="orderAmount" label="订单金额" align="center"> </el-table-column>
<el-table-column prop="discountAmount" label="优惠金额" align="center" width="120"> </el-table-column> <el-table-column prop="discountAmount" label="优惠金额" align="center"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="付款信息" align="center"> <el-table-column label="付款信息" align="center">
<el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column> <el-table-column prop="payAmount" label="实付金额" align="center"> </el-table-column>
<el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120"> <el-table-column prop="balanceAmount" label="储值卡付款金额" align="center" width="115"/>
<template slot-scope="props"> <el-table-column prop="oilCardAmount" label="囤油卡付款升数" align="center" width="115"/>
<span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span> <el-table-column prop="payUser" label="付款用户" align="center" width="110" > </el-table-column>
<span v-else>0</span> <el-table-column prop="payType" label="付款方式" align="center">
</template>
</el-table-column>
<el-table-column prop="payUser" label="付款用户" align="center" width="120" > </el-table-column>
<el-table-column prop="payType" label="付款方式" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{getType(payList,scope.row.payType)}}</span> <span>{{getType(payList,scope.row.payType)}}</span>
</template> </template>
@ -203,6 +200,11 @@
</el-table-column> </el-table-column>
</el-table-column> </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 prop="orderType" label="用户评价" align="center" >
<template slot-scope="scope">
<span>{{scope.row.remark || "--"}}</span>
</template>
</el-table-column>
<el-table-column label="交易时间" align="center" width="160" prop="payTime"> <el-table-column label="交易时间" align="center" width="160" prop="payTime">
<template slot-scope="scope"> <template slot-scope="scope">

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
View File

@ -114,6 +114,10 @@ public class LJGoods extends BaseEntity implements Serializable {
* 是否删除：0未删除，1已删除 * 是否删除：0未删除，1已删除
*/ */
private String ifDelete; private String ifDelete;
/**
* 可否使用兑换券兑换；0可以，1不可以
*/
private String canUseExchange;
} }

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
View File

@ -32,6 +32,9 @@
<if test="goods.status != null and goods.status != ''"> <if test="goods.status != null and goods.status != ''">
and mg.status = #{goods.status} and mg.status = #{goods.status}
</if> </if>
<if test="goods.canUseExchange != null and goods.canUseExchange != ''">
and mg.can_use_exchange = #{goods.canUseExchange}
</if>
<if test="goods.remark != null and goods.remark != ''"> <if test="goods.remark != null and goods.remark != ''">
and( and(
mg.name like concat('%', #{goods.remark}, '%') mg.name like concat('%', #{goods.remark}, '%')

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java
View File

@ -27,6 +27,18 @@ public class CreditUnitController extends BaseController {
return getSuccessResult(creditUnitService.selectCreditUnitList(page,creditUnit)); return getSuccessResult(creditUnitService.selectCreditUnitList(page,creditUnit));
} }
/**
* 查询所有挂账单位信息
* @return
*/
@GetMapping("/selectList")
private ResponseObject selectList(CreditUnit creditUnit,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
return getSuccessResult(creditUnitService.selectCreditUnitOrderList(page,creditUnit));
}
/** /**
* 查询所有挂账单位信息 * 查询所有挂账单位信息
* @return * @return

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.order.entity.CashierOrder;
import com.fuint.business.order.entity.HangBill; import com.fuint.business.order.entity.HangBill;
import com.fuint.business.order.service.HangBillService; import com.fuint.business.order.service.HangBillService;
import com.fuint.business.order.vo.HangBillVo; import com.fuint.business.order.vo.HangBillVo;
@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Map; import java.util.Map;
/** /**
@ -135,4 +137,13 @@ public class HangBillController extends BaseController {
public ResponseObject returnTotal(){ public ResponseObject returnTotal(){
return getSuccessResult(hangBillService.selectCountReturn()); return getSuccessResult(hangBillService.selectCountReturn());
} }
/**
* 导出订单
* @param response
*/
@PostMapping("exportExcel")
public void exportExcel(HttpServletResponse response, @RequestBody HangBillVo hangBillVo) {
hangBillService.export(response, hangBillVo);
}
} }

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
View File

@ -1,8 +1,10 @@
package com.fuint.business.order.entity; package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fuint.business.order.vo.HangBillVo;
import com.fuint.framework.entity.BaseEntity; import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -10,6 +12,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* 挂账单位信息表(CreditUnit)实体类 * 挂账单位信息表(CreditUnit)实体类
@ -69,6 +72,10 @@ public class CreditUnit extends BaseEntity implements Serializable {
* 单位状态：启用禁用 * 单位状态：启用禁用
*/ */
private String status; private String status;
/**
* 挂账订单列表
*/
@TableField(exist = false)
private List<HangBillVo> hangBillVos;
} }

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java
View File

@ -21,6 +21,12 @@ public interface HangBillMapper extends BaseMapper<HangBill> {
*/ */
public IPage<HangBillVo> selectHangBillList(Page page,@Param("hangBill") HangBillVo hangBill); public IPage<HangBillVo> selectHangBillList(Page page,@Param("hangBill") HangBillVo hangBill);
/**
* 查询所有挂账记录信息
* @return
*/
public List<HangBillVo> selectHangBillsByCreditUnit(@Param("hangBill") HangBillVo hangBill);
/** /**
* 查询所有挂账信息 * 查询所有挂账信息
* @param storeId * @param storeId

37
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
View File

@ -36,8 +36,8 @@
<if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 --> <if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(hb.create_time,'%y%m%d') &lt;= date_format(#{hangBill.params.endTime},'%y%m%d') and date_format(hb.create_time,'%y%m%d') &lt;= date_format(#{hangBill.params.endTime},'%y%m%d')
</if> </if>
order by create_time desc
</where> </where>
order by create_time desc
</select> </select>
<select id="selectHangBillById" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int"> <select id="selectHangBillById" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int">
<include refid="selectHangBill"></include> <include refid="selectHangBill"></include>
@ -62,4 +62,39 @@
<select id="selectNoReturnAmount" resultType="java.lang.Double"> <select id="selectNoReturnAmount" resultType="java.lang.Double">
select sum(outstand_amount) from hang_bill where store_id = #{storeId} select sum(outstand_amount) from hang_bill where store_id = #{storeId}
</select> </select>
<select id="selectHangBillsByCreditUnit" resultType="com.fuint.business.order.vo.HangBillVo"
parameterType="com.fuint.business.order.vo.HangBillVo">
<include refid="selectHangBill"></include>
<where>
hb.store_id = #{hangBill.storeId}
<if test="hangBill.status != null and hangBill.status != ''">
and hb.status = #{hangBill.status}
</if>
<if test="hangBill.returnType != null and hangBill.returnType != ''">
and hb.return_type = #{hangBill.returnType}
</if>
<if test="hangBill.creditUnitId != null and hangBill.creditUnitId != ''">
and hb.credit_unit_id like concat('%', #{hangBill.creditUnitId}, '%')
</if>
<if test="hangBill.unitName != null and hangBill.unitName != ''">
and cu.unit_name like concat('%', #{hangBill.unitName}, '%')
</if>
<if test="hangBill.personCredit != null and hangBill.personCredit != ''">
and cu.person_credit like concat('%', #{hangBill.personCredit}, '%')
</if>
<if test="hangBill.contactMobile != null and hangBill.contactMobile != ''">
and cu.contact_mobile like concat('%', #{hangBill.contactMobile}, '%')
</if>
<if test="hangBill.mobile != null and hangBill.mobile != ''">
and ms.mobile like concat('%', #{hangBill.mobile}, '%')
</if>
<if test="hangBill.params.beginTime != null and hangBill.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(hb.create_time,'%y%m%d') &gt;= date_format(#{hangBill.params.beginTime},'%y%m%d')
</if>
<if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(hb.create_time,'%y%m%d') &lt;= date_format(#{hangBill.params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>
</mapper> </mapper>

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java
View File

@ -21,6 +21,14 @@ public interface CreditUnitService extends IService<CreditUnit> {
*/ */
public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit); public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit);
/**
* 根据条件分页查询挂账单位信息和挂账单位下的订单信息
* @param page
* @param creditUnit
* @return
*/
public IPage<CreditUnit> selectCreditUnitOrderList(Page page, CreditUnit creditUnit);
/** /**
* 查询所有挂账单位信息 * 查询所有挂账单位信息
* @return * @return

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
View File

@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.order.entity.HangBill; import com.fuint.business.order.entity.HangBill;
import com.fuint.business.order.entity.ReturnRecord;
import com.fuint.business.order.vo.HangBillVo; import com.fuint.business.order.vo.HangBillVo;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -24,6 +24,12 @@ public interface HangBillService extends IService<HangBill> {
*/ */
public IPage<HangBillVo> selectHangBillList(Page page, HangBillVo hangBill); public IPage<HangBillVo> selectHangBillList(Page page, HangBillVo hangBill);
/**
* 查询所有挂账记录信息
* @return
*/
public List<HangBillVo> selectHangBillsByCreditUnit(HangBillVo hangBill);
/** /**
* 查询所有挂账记录信息 * 查询所有挂账记录信息
* @return * @return
@ -104,4 +110,6 @@ public interface HangBillService extends IService<HangBill> {
* @return * @return
*/ */
Double selectNoReturnAmount(); Double selectNoReturnAmount();
void export(HttpServletResponse response, HangBillVo hangBill);
} }

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
View File

@ -8,11 +8,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.order.entity.CreditUnit; import com.fuint.business.order.entity.CreditUnit;
import com.fuint.business.order.mapper.CreditUnitMapper; import com.fuint.business.order.mapper.CreditUnitMapper;
import com.fuint.business.order.service.CreditUnitService; import com.fuint.business.order.service.CreditUnitService;
import com.fuint.business.order.service.HangBillService;
import com.fuint.business.order.vo.HangBillVo;
import com.fuint.business.storeInformation.entity.LJStore; import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -21,6 +24,9 @@ import java.util.List;
public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditUnit> implements CreditUnitService { public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditUnit> implements CreditUnitService {
@Autowired @Autowired
private ILJStoreService storeService; private ILJStoreService storeService;
@Autowired
@Lazy
private HangBillService hangBillService;
@Override @Override
public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit) { public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit) {
@ -29,6 +35,20 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
return baseMapper.selectCreditUnitList(page,creditUnit); return baseMapper.selectCreditUnitList(page,creditUnit);
} }
@Override
public IPage<CreditUnit> selectCreditUnitOrderList(Page page, CreditUnit creditUnit) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
creditUnit.setStoreId(nowAccountInfo.getStoreId());
IPage<CreditUnit> creditUnitIPage = baseMapper.selectCreditUnitList(page, creditUnit);
for (CreditUnit record : creditUnitIPage.getRecords()) {
HangBillVo hangBillVo = new HangBillVo();
hangBillVo.setCreditUnitId(record.getId());
List<HangBillVo> hangBillVos = hangBillService.selectHangBillsByCreditUnit(hangBillVo);
record.setHangBillVos(hangBillVos);
}
return creditUnitIPage;
}
@Override @Override
public List<CreditUnit> selectCreditUnitList() { public List<CreditUnit> selectCreditUnitList() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();

36
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.fuint.business.order.service.impl; package com.fuint.business.order.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -20,12 +21,14 @@ import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.service.CreditUnitService; import com.fuint.business.order.service.CreditUnitService;
import com.fuint.business.order.service.HangBillService; import com.fuint.business.order.service.HangBillService;
import com.fuint.business.order.service.ReturnRecordService; import com.fuint.business.order.service.ReturnRecordService;
import com.fuint.business.order.vo.Excel.CashierOrderExcel;
import com.fuint.business.order.vo.HangBillVo; import com.fuint.business.order.vo.HangBillVo;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@ -46,6 +49,14 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
return hangBillVoIPage; return hangBillVoIPage;
} }
@Override
public List<HangBillVo> selectHangBillsByCreditUnit(HangBillVo hangBill) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
hangBill.setStoreId(storeId);
return baseMapper.selectHangBillsByCreditUnit(hangBill);
}
@Override @Override
public List<HangBillVo> selectHangBills() { public List<HangBillVo> selectHangBills() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -280,6 +291,31 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
return baseMapper.selectNoReturnAmount(nowAccountInfo.getStoreId()); return baseMapper.selectNoReturnAmount(nowAccountInfo.getStoreId());
} }
@Override
public void export(HttpServletResponse response, HangBillVo hangBill) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
hangBill.setStoreId(storeId);
// List<CashierOrderExcel> cashierOrderExcels = baseMapper.selectCashierOrderListExport(hangBill);
// 设置文件名字
String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
// 设置响应头信息
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
try{
// 写入文件数据
// EasyExcel.write(response.getOutputStream(), CashierOrderExcel.class).sheet("download").doWrite(cashierOrderExcels);
}catch(Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
}
/** /**
* 调用支付接口 * 调用支付接口
* @param map * @param map

8
fuintCashierWeb/src/api/cashier/creditunit.js
View File

@ -8,6 +8,14 @@ export function listCreditUnit(query) {
params: query params: query
}) })
} }
// 查询挂账信息列表
export function creditUnits(query) {
return request({
url: '/business/creditUnit/selectList',
method: 'get',
params: query
})
}
// 新增挂账记录 // 新增挂账记录
export function addCreditUnit(data) { export function addCreditUnit(data) {

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

@ -7,10 +7,10 @@
<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>
<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>-->
<!-- <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>-->
<el-radio-button label="积分兑换订单"></el-radio-button> <!-- <el-radio-button label="积分兑换订单"></el-radio-button>-->
</el-radio-group> </el-radio-group>
</el-card> </el-card>
</div> </div>
@ -18,10 +18,10 @@
<order_Oil v-if="radio1 == '油品交易订单' "></order_Oil> <order_Oil v-if="radio1 == '油品交易订单' "></order_Oil>
<order_Goods v-if="radio1 == '商品交易订单' "></order_Goods> <order_Goods v-if="radio1 == '商品交易订单' "></order_Goods>
<order_Vip v-if="radio1 == '会员充值订单' "></order_Vip> <order_Vip v-if="radio1 == '会员充值订单' "></order_Vip>
<order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary> <!-- <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
<!-- <order_Added v-if="radio1 == '增值交易订单' "></order_Added>--> <order_Added v-if="radio1 == '挂账订单' "></order_Added>
<order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid> <!-- <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
<order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral> <!-- <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
</div> </div>
</template> </template>

342
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -5,18 +5,6 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>挂账</span> <span>挂账</span>
</div> </div>
<!-- <div style="display: flex;">-->
<!-- <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>-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <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 <el-select
@ -122,85 +110,93 @@
<div class="wgang"> <div class="wgang">
<div>列表</div> <div>列表</div>
<div style="display: flex "> <div style="display: flex ">
<el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button> <el-button type="primary" size="mini" @click="open1 = true">新增挂账单位</el-button>
<el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button> <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>
</div> </div>
</div> </div>
<div class="table-box"> <div class="table-box">
<el-table <el-table
:data="hangBillList" :data="creditUnitList"
style="width: 100%"> style="width: 100%">
<el-table-column type="expand"> <el-table-column type="expand" >
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand"> <el-table ref="tables" :data="props.row.hangBillVos">
<el-form-item label="操作人手机号"> <el-table-column type="index" width="80" align="center" label="序号"/>
<span>{{ props.row.mobile }}</span> <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
</el-form-item><br/> <el-table-column prop="returnType" align="center" label="类型">
<el-form-item label="更新时间"> <template slot-scope="scope">
<span>{{ props.row.updateTime ? props.row.updateTime:"--" }}</span> <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
</el-form-item><br/> <el-tag v-else type="success">归还</el-tag>
<el-form-item label="单据备注"> </template>
<span>{{ props.row.remark ? props.row.remark:"--" }}</span> </el-table-column>
</el-form-item><br/> <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
<el-form-item label="单据金额"> <el-table-column prop="status" align="center" label="状态">
<span>{{ props.row.amount ? props.row.amount:"0" }}</span> <template slot-scope="scope">
</el-form-item> <span v-if="scope.row.status == 0">未归还</span>
<el-form-item label="已还金额"> <span v-else-if="scope.row.status == 1" type="success">已归还</span>
<span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span> <span v-else type="success">部分归还</span>
</el-form-item> </template>
<el-form-item label="未还金额"> </el-table-column>
<span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span> <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
</el-form-item> <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
</el-form> <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-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
:disabled="scope.row.status == 1"
@click="repay(scope.row.id)"
>归还</el-button>
<el-button
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情</el-button>
</template>
</el-table-column>
</el-table>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column> <el-table-column label="单位名称" prop="unitName" align="center" width="120"/>
<el-table-column align="center" label="挂账单位"> <el-table-column label="挂账人" prop="personCredit" align="center" width="160"/>
<el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column> <el-table-column label="联系电话" prop="contactMobile" align="center" width="120"/>
<el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column> <el-table-column label="预设挂账额度" prop="creditLimit" align="center" width="160"/>
<el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column> <el-table-column label="已使用挂账额度" prop="usedCreditLimit" align="center" width="160"/>
<el-table-column label="剩余可挂账额度" prop="residueCreditLimit" align="center" width="160"/>
<el-table-column label="备注" prop="remark" align="center" width="120"/>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<el-tag v-if="scope.row.status=='qy'">启用</el-tag>
<el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
<!-- <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
</template>
</el-table-column> </el-table-column>
<el-table-column label="记录明细" align="center"> <el-table-column label="创建时间" align="center" width="160" prop="createTime">
<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="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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="190" fixed='right'>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- >修改</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
:disabled="scope.row.status == 1" icon="el-icon-edit"
@click="repay(scope.row.id)" @click="handleUpdate(scope.row)"
>归还</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="returnRecord(scope.row.id)" icon="el-icon-delete"
>归还详情</el-button> @click="handleDelete(scope.row)"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -218,6 +214,107 @@
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!--&lt;!&ndash; 挂账列表&ndash;&gt;-->
<!-- <el-card class="box-card">-->
<!-- <div class="wgang">-->
<!-- <div>列表</div>-->
<!-- <div style="display: flex ">-->
<!-- <el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button>-->
<!-- <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>-->
<!-- </div>-->
<!-- </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 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="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-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; type="text"&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-edit"&ndash;&gt;-->
<!--&lt;!&ndash; >修改</el-button>&ndash;&gt;-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- :disabled="scope.row.status == 1"-->
<!-- @click="repay(scope.row.id)"-->
<!-- >归还</el-button>-->
<!-- <el-button-->
<!-- 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-->
<!-- layout="prev, pager, next"-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.page"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @current-change="getList">-->
<!-- </el-pagination>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- 归还记录信息--> <!-- 归还记录信息-->
<el-drawer <el-drawer
@ -377,12 +474,36 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="挂账额度" prop="creditLimit"> <el-form-item label="预设挂账额度" prop="creditLimit">
<el-input v-model="form1.creditLimit" placeholder="请输入挂账额度，为0则不限额" maxlength="30"> <el-input v-model="form1.creditLimit" placeholder="请输入预设挂账额度" maxlength="10">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
<span style="font-size: 12px;color: grey"> <span style="font-size: 12px;color: grey">
0为不限额,额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="已使用挂账额度" prop="creditLimit">
<el-input v-model="form1.usedCreditLimit" disabled placeholder="0" maxlength="10">
<template slot="append">元</template>
</el-input>
<span style="font-size: 12px;color: grey">
额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="剩余挂账额度" prop="creditLimit">
<el-input v-model="form1.residueCreditLimit" disabled placeholder="0" maxlength="10">
<template slot="append">元</template>
</el-input>
<span style="font-size: 12px;color: grey">
额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
</span> </span>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -683,7 +804,14 @@ import {
listHangBill, listHangBill,
queryHangBill queryHangBill
} from "@/api/cashier/hangbill"; } from "@/api/cashier/hangbill";
import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit"; import {
addCreditUnit,
creditUnitInfo,
creditUnits,
deleteCreditUnit,
editCreditUnit,
listCreditUnit
} from "@/api/cashier/creditunit";
import {getDicts} from "@/api/dict/data"; import {getDicts} from "@/api/dict/data";
import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/cashier/returnrecord"; import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/cashier/returnrecord";
@ -761,6 +889,8 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
hangBillList:[], hangBillList:[],
// 归还记录列表 // 归还记录列表
returnRecordList:[], returnRecordList:[],
// 挂账单位列表
creditUnitList:[],
// 总条数 // 总条数
total: 0, total: 0,
total1: 0, total1: 0,
@ -796,11 +926,11 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
} }
}, },
created() { created() {
this.getList(); // this.getList();
this.getUnitList(); // this.getUnitList();
this.getPayList(); this.getPayList();
this.getLists(); this.getLists();
// this.getStatistic(); this.getCreditUnits();
}, },
directives: { directives: {
// 注册一个局部的自定义指令 v-focus // 注册一个局部的自定义指令 v-focus
@ -816,6 +946,34 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
}, },
}, },
methods:{ methods:{
handleUpdate(data){
creditUnitInfo(data.id).then(res => {
this.form1 = res.data
this.title = "修改挂账单位"
this.open1 = true
})
},
handleDelete(row){
const name = row.unitName
this.$modal.confirm('确定删除"' + name + '"的挂账单位信息？').then(function() {
// return deleteMember(row.id);
return deleteCreditUnit(row.id);
}).then(() => {
this.queryParams.page = 1
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
getCreditUnits(val){
if (val!=undefined){
this.queryParams.page = val
}
creditUnits().then(res => {
this.creditUnitList = res.data.records
this.total = res.data.total;
})
},
// 获取挂账统计信息 // 获取挂账统计信息
getStatistic(){ getStatistic(){
hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => { hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
@ -1138,11 +1296,31 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
addCredit(){ addCredit(){
this.$refs["formName"].validate((valid) => { this.$refs["formName"].validate((valid) => {
if (valid) { if (valid) {
addCreditUnit(this.form1).then( response => { if (this.form1.id){
this.$modal.msgSuccess("挂账单位信息创建成功"); if (this.form1.creditLimit < this.form1.residueCreditLimit){
this.open1 = false; this.$modal.msgError("请确保预设挂账额度大于剩余挂账额度");
this.getUnitList(); return ;
}) }
editCreditUnit(this.form1).then(res => {
if (res.data==1) {
this.$modal.msgSuccess("挂账单位信息修改成功");
this.open1 = false;
this.getCreditUnits();
}else {
this.$modal.msgError("挂账单位信息修改失败");
}
})
}else {
addCreditUnit(this.form1).then( response => {
if (response.data==1) {
this.$modal.msgSuccess("挂账单位信息创建成功");
this.open1 = false;
this.getCreditUnits();
}else {
this.$modal.msgError("挂账单位信息创建失败，挂站单位名称不可重复");
}
})
}
}else { }else {
return false; return false;
} }

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

@ -1,116 +1,174 @@
<!--增值交易订单--> <!--增值交易订单-->
<template> <template>
<div> <div>
<!-- 表单查询-->
<el-card class="box-card"> <el-card class="box-card">
<div style="display: flex;"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<div class="top-app-sou"> <el-form-item label="归还状态" prop="returnType">
<el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign"> <el-select
<el-form-item label="名称"> v-model="queryParams.returnType"
<el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input> clearable
</el-form-item> placeholder="全部"
</el-form> >
</div> <el-option label="挂账" value="0"></el-option>
<div style="margin-left: 10px"> <el-option label="归还" value="1"></el-option>
<el-button type="primary" icon="el-icon-search">搜索</el-button> </el-select>
</div> </el-form-item>
</div> <el-form-item label="订单状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="全部"
clearable
>
<el-option label="未归还" value="0"></el-option>
<el-option label="已归还" value="1"></el-option>
<el-option label="部分归还" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="单位名称" prop="unitName">
<el-input
v-model="queryParams.unitName"
placeholder="请输入挂账单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="挂账人" prop="personCredit">
<el-input
v-model="queryParams.personCredit"
placeholder="请输入挂账人名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系电话" prop="contactMobile">
<el-input
v-model="queryParams.contactMobile"
placeholder="请输入挂账人联系电话"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人手机号" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入操作人手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
size="medium"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-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-form-item>
</el-form>
</el-card> </el-card>
<!-- 统计-->
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>增值交易统计</span> <span>统计</span>
</div> </div>
<div class="box-gang"> <div class="box-gang">
<div class="box" v-for="(item,index) in 7" :key="index"> <div class="box">
<div class="size-hui">订单总数</div> <div class="size-hui">挂账笔数</div>
<div class="size-bole">55</div> <div class="size-bole">{{ total }}</div>
</div>
<div class="box">
<div class="size-hui">挂账总额</div>
<div class="size-bole">{{ allAmount }}</div>
</div>
<div class="box">
<div class="size-hui">归还笔数</div>
<div class="size-bole">{{ returnTotal }}</div>
</div>
<div class="box">
<div class="size-hui">归还总额</div>
<div class="size-bole">{{ returnAllAmount }}</div>
</div>
<div class="box">
<div class="size-hui">未还金额</div>
<div class="size-bole">{{ noReturnAllAmount }}</div>
</div> </div>
</div> </div>
</el-card> </el-card>
<!-- 列表-->
<el-card class="box-card"> <el-card class="box-card">
<div class="wgang"> <div class="wgang">
<div>增值交易列表</div> <div>挂账订单列表</div>
<div style="display: flex "> <div style="display: flex ">
<el-button type="primary" size="mini" icon="el-icon-plus">新增会员</el-button> <el-button type="primary" size="mini" icon="el-icon-plus">导出订单</el-button>
</div> </div>
</div> </div>
<div class="table-box"> <div class="table-box">
<el-table <el-table
:data="tableData" :data="hangBillList"
style="width: 100%"> style="width: 100%">
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">
<el-form-item label="名称"> <el-form-item label="操作人手机号">
<span>{{ props.row.name }}</span> <span>{{ props.row.mobile }}</span>
</el-form-item><br/>
<el-form-item label="更新时间">
<span>{{ props.row.updateTime ? props.row.updateTime:"--" }}</span>
</el-form-item><br/>
<el-form-item label="单据备注">
<span>{{ props.row.remark ? props.row.remark:"--" }}</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-item>
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
prop="date" <el-table-column align="center" label="挂账单位">
label="用户信息" <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
width="150"> <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>
<el-table-column label="余额"> <el-table-column label="记录明细" align="center">
<el-table-column <el-table-column prop="returnType" align="center" label="类型">
prop="name" <template slot-scope="scope">
label="储值卡" <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
width="120"> <el-tag v-else type="success">归还</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
prop="name" <el-table-column prop="status" align="center" label="状态">
label="升值卡" <template slot-scope="scope">
width="120"> <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>
<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>
<el-table-column label="会员等级"> <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
<el-table-column <el-table-column prop="createTime" align="center" label="创建时间" width="220">
prop="province" <template slot-scope="scope">
label="汽油" <span>{{ parseTime(scope.row.createTime) }}</span>
width="120"> </template>
</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>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -118,87 +176,253 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" @click="returnRecord(scope.row.id)"
>更多操作</el-button> >归还详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination-box"> <div class="pagination-box">
<el-pagination <el-pagination
background background
v-show="total>0"
layout="prev, pager, next" layout="prev, pager, next"
:total="1000"> :total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 归还记录信息-->
<el-drawer
title="归还详情"
:visible.sync="drawer"
direction="rtl"
size="55%"
:before-close="handleClose">
<div style="display: grid; place-items: center;">
<el-card style="background-color: #f5f5f5;width: 90%">
<div slot="header" class="clearfix">
<div style="position: relative;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
<h2>单据号：{{record.orderNo}}</h2>
</div>
</div>
<br>
<div style="display: flex; justify-content: space-between;">
<span>操作员工：</span>
<span>{{ record.realName }}</span>
</div>
</div>
<div >
<div style="display: flex; justify-content: space-between;">
<span>挂账单位</span>
<span>{{record.unitName}}</span>
</div>
<div style="display: flex; justify-content: space-between;margin: 10px 0">
<span>挂账人</span>
<span>{{record.personCredit}}</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span>联系电话</span>
<span>{{record.contactMobile}}</span>
</div>
</div>
</el-card>
<el-card style="margin-top: 15px;width: 90%">
<el-table ref="tables"
v-loading="loading"
:data="returnRecordList">
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
<el-table-column label="类型" align="center" prop="returnType">
<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 label="归还金额" align="center" prop="amount" />
<el-table-column label="找零金额" align="center" prop="seekZero" />
<el-table-column label="归还方式" align="center" prop="status">
<template slot-scope="scope">
<span>{{ getPayMeth(payList,scope.row.status) }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus">
<template slot-scope="scope">
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="realName" />
<el-table-column label="支付时间" align="center" prop="payTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@current-change="getRecordList">
</el-pagination>
</div>
</el-card>
</div>
</el-drawer>
</div> </div>
</template> </template>
<script> <script>
import {
hangBillAllAmount,
hangBillAllNoReturnAmount,
hangBillAllReturnAmount, hangBillInfo, hangBillReturnTotal,
listHangBill
} from "@/api/cashier/hangbill";
import {getDicts} from "@/api/dict/data";
import {listReturnRecord} from "@/api/cashier/returnrecord";
export default { export default {
name: "order_Cashier", name: "order_Cashier",
data(){ data(){
return{ return{
labelPosition: 'right', queryParams1: {
formLabelAlign: { page: 1,
name: '', pageSize: 10,
hangBillId:"",
}, },
tableData: [{ hangBillList:[],
date: '2016-05-03', total:0,
name: '王小狼', total2:0,
province: '上海', loading:false,
city: '普陀区', queryParams:{
address: '上海市普陀区金沙江路 1518 弄', page:1,
zip: 200333 pageSize:10,
}, { returnType:"",
date: '2016-05-02', status:"",
name: '王小虎', unitName:"",
province: '上海', personCredit:"",
city: '普陀区', contactMobile:"",
address: '上海市普陀区金沙江路 1518 弄', mobile:"",
zip: 200333 },
}, { dateRange:[],
date: '2016-05-04', returnRecordList:[],
name: '王小虎', payList:[],
province: '上海', // 归还账单总数
city: '普陀区', returnTotal:0,
address: '上海市普陀区金沙江路 1518 弄', // 挂账总额
zip: 200333 allAmount:0,
}, { // 归还总额
date: '2016-05-01', returnAllAmount:0,
name: '王小虎', // 未归还总额
province: '上海', noReturnAllAmount:0,
city: '普陀区', drawer:false,
address: '上海市普陀区金沙江路 1518 弄', // 挂账信息
zip: 200333 record:{},
}, {
date: '2016-05-08',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-06',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-07',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}]
} }
},
created() {
this.getList()
this.getPayList()
},
methods: {
// 归还记录详情弹框
returnRecord(id){
this.record = {}
this.drawer = true
hangBillInfo(id).then(response => {
this.record = response.data
})
this.getRecordList(id,1);
},
getRecordList(id,val){
if (val!=1){
this.queryParams1.page = id
this.queryParams1.hangBillId = this.record.id
}else {
this.queryParams1.hangBillId = id
}
listReturnRecord(this.queryParams1).then(response => {
this.returnRecordList = response.data.records
this.total2 = response.data.total
})
},
// 获取支付方式
getPayList() {
getDicts("payment_type").then(response => {
this.payList = response.data;
})
},
getPayMeth(list,val){
let name = "";
if (list!=null && list!=""){
list.forEach(item => {
if (item.dictValue == val){
name = item.dictLabel
}
})
}
return name;
},
// 是否关闭弹框
handleClose(done) {
done();
},
getList(val){
if (val!=undefined){
this.queryParams.page = val
}
listHangBill(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.hangBillList = response.data.records
this.total = response.data.total;
})
this.getStatistic();
},
// 获取挂账统计信息
getStatistic(){
hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.returnTotal = res.data
})
hangBillAllAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.allAmount = res.data
}
})
hangBillAllReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.returnAllAmount = res.data
}
})
hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if (res.data) {
this.noReturnAllAmount = res.data
}
})
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams.page = 1;
this.resetForm("queryForm");
this.handleQuery();
},
} }
} }
</script> </script>

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

@ -19,27 +19,27 @@
<el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input> <el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="交易时间"> <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--> <!-- <el-date-picker-->
<!-- v-model="dateRange"--> <!-- v-model="beginTime"-->
<!-- style="width: 240px"--> <!-- type="datetime"-->
<!-- size="medium"--> <!-- placeholder="开始日期">-->
<!-- value-format="yyyy-MM-dd"--> <!-- </el-date-picker>-->
<!-- type="daterange"--> <!-- 至-->
<!-- range-separator="-"--> <!-- <el-date-picker-->
<!-- start-placeholder="开始日期"--> <!-- v-model="endTime"-->
<!-- end-placeholder="结束日期"--> <!-- type="datetime"-->
<!-- ></el-date-picker>--> <!-- placeholder="结束日期">-->
<el-date-picker <!-- </el-date-picker>-->
v-model="beginTime"
type="datetime"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
type="datetime"
placeholder="结束日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@ -418,6 +418,8 @@ import {formatDate} from "@/utils";
queryParams: { queryParams: {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
beginTime:"",
endTime:"",
}, },
orderStatistics:{ orderStatistics:{
numberOfStrokes:'0', numberOfStrokes:'0',
@ -440,8 +442,8 @@ import {formatDate} from "@/utils";
methods:{ methods:{
exportExcelCashier() { exportExcelCashier() {
this.dateRange.push(this.beginTime) // this.dateRange.push(this.beginTime)
this.dateRange.push(this.endTime) // this.dateRange.push(this.endTime)
exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'收银台订单统计.xLsx') this.$download.saveAs(blob,'收银台订单统计.xLsx')
@ -450,8 +452,8 @@ import {formatDate} from "@/utils";
// 获取订单统计信息 // 获取订单统计信息
getOrderStatistics() { getOrderStatistics() {
this.dateRange.push(this.beginTime) // this.dateRange.push(this.beginTime)
this.dateRange.push(this.endTime) // this.dateRange.push(this.endTime)
orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
this.orderStatistics = res.data this.orderStatistics = res.data
}) })
@ -682,6 +684,16 @@ import {formatDate} from "@/utils";
this.goodsInfo = response.data; this.goodsInfo = response.data;
}) })
}, },
parseTime1(dateTime) {
let date = new Date(dateTime);
let y = date.getFullYear() + "-";
let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
return new Date(y , mon , d , h , m , s);
},
// 获取列表信息 // 获取列表信息
getList(val){ getList(val){
if (val!=undefined){ if (val!=undefined){
@ -691,17 +703,17 @@ import {formatDate} from "@/utils";
let time1 = "" let time1 = ""
let time2 = "" let time2 = ""
if (this.beginTime && this.endTime){ if (this.beginTime && this.endTime){
let beginTime = this.beginTime.getTime() // let beginTime = this.beginTime.getTime()
let endTime = this.endTime.getTime() // let endTime = this.endTime.getTime()
// time1 = formatDate(beginTime, 'yyyy-MM-dd') time1 = this.parseTime1(this.beginTime)
// time2 = formatDate(endTime, 'yyyy-MM-dd') time2 = this.parseTime1(this.endTime)
time1 = new Date(beginTime)
time2 = new Date(endTime)
this.$modal.msgError(time1)
} }
let dateRange = []
// this.$modal.msgError() // this.$modal.msgError()
this.dateRange.push(time1) // dateRange.push(time1.toString())
this.dateRange.push(time2) // dateRange.push(time2.toString())
// this.$modal.msgError(this.dateRange.toString())
// this.dateRange = dateRange.toString()
listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => { listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.orderList = response.data.records; this.orderList = response.data.records;
this.total = response.data.total; this.total = response.data.total;
@ -712,8 +724,8 @@ import {formatDate} from "@/utils";
if (val!=undefined){ if (val!=undefined){
this.queryParams.page = val this.queryParams.page = val
} }
this.dateRange.push(this.beginTime) // this.dateRange.push(this.beginTime)
this.dateRange.push(this.endTime) // this.dateRange.push(this.endTime)
cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => { cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
if (response.data) { if (response.data) {
this.seekZeroAmount = response.data this.seekZeroAmount = response.data

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

@ -53,7 +53,7 @@
size="medium" size="medium"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="-" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>

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

@ -73,7 +73,7 @@
size="medium" size="medium"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="-" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
@ -142,54 +142,51 @@
v-loading="loading" v-loading="loading"
:data="oilOrderList" :data="oilOrderList"
style="width: 100%"> style="width: 100%">
<el-table-column type="expand"> <!-- <el-table-column type="expand">-->
<template slot-scope="props"> <!-- <template slot-scope="props">-->
<el-form label-position="left" class="demo-table-expand" style="margin-left: 20px"> <!-- <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
<el-form-item label="用户信息"> <!-- <el-form-item label="用户信息">-->
<span>{{ props.row.userId ? queryUser(userList,props.row.userId):"--" }}</span> <!-- <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"&#45;&#45;" }}</span>-->
</el-form-item>
<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-item label="用户评价">
<span>{{ props.row.remark ? props.row.remark:"--" }}</span>
</el-form-item>
<!-- <el-form-item label="订单备注">-->
<!-- <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
<!-- <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> <!-- <el-form-item label="收银员">-->
</template> <!-- <span>{{ queryStaf(staffList,props.row.staffId) }}</span>-->
</el-table-column> <!-- </el-form-item>-->
<!-- <el-form-item label="来源终端">-->
<!-- <span>{{ getVal(terminalList,props.row.terminal) }}</span>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户评价">-->
<!-- <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="订单备注">&ndash;&gt;-->
<!--&lt;!&ndash; <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>&ndash;&gt;-->
<!--&lt;!&ndash; <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>&ndash;&gt;-->
<!--&lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column prop="terminal" label="终端" align="center" width="80"> <el-table-column prop="terminal" label="终端" align="center" width="80">
<template slot-scope="props"> <template slot-scope="props">
<span>{{ getVal(terminalList,props.row.terminal) }}</span> <span>{{ getVal(terminalList,props.row.terminal) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column> <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column label="订单信息" align="center"> <el-table-column label="订单信息" align="center">
<el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120"> <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="90">
<template slot-scope="props"> <template slot-scope="props">
<span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span> <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderAmount" label="订单金额" align="center" width="120"> </el-table-column> <el-table-column prop="orderAmount" label="订单金额" align="center"> </el-table-column>
<el-table-column prop="discountAmount" label="优惠金额" align="center" width="120"> </el-table-column> <el-table-column prop="discountAmount" label="优惠金额" align="center"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="付款信息" align="center"> <el-table-column label="付款信息" align="center">
<el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column> <el-table-column prop="payAmount" label="实付金额" align="center"> </el-table-column>
<el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120"> <el-table-column prop="balanceAmount" label="储值卡付款金额" align="center" width="115"/>
<template slot-scope="props"> <el-table-column prop="oilCardAmount" label="囤油卡付款升数" align="center" width="115"/>
<span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span> <el-table-column prop="payUser" label="付款用户" align="center" width="110"> </el-table-column>
<span v-else>0</span> <el-table-column prop="payType" label="付款方式" align="center">
</template>
</el-table-column>
<el-table-column prop="payUser" label="付款用户" align="center" width="120"> </el-table-column>
<el-table-column prop="payType" label="付款方式" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{getType(payList,scope.row.payType)}}</span> <span>{{getType(payList,scope.row.payType)}}</span>
</template> </template>
@ -204,6 +201,11 @@
</el-table-column> </el-table-column>
</el-table-column> </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 prop="orderType" label="用户评价" align="center" >
<template slot-scope="scope">
<span>{{scope.row.remark || "--"}}</span>
</template>
</el-table-column>
<el-table-column label="交易时间" align="center" width="160" prop="payTime"> <el-table-column label="交易时间" align="center" width="160" prop="payTime">
<template slot-scope="scope"> <template slot-scope="scope">

2
gasStation-uni/pagesRefuel/orderDetail/index.vue
View File

@ -311,7 +311,7 @@
activeId:this.preferentialData.activeId, activeId:this.preferentialData.activeId,
cardFavorableId:this.preferentialData.cardFavorableId, cardFavorableId:this.preferentialData.cardFavorableId,
type:this.preferentialData.type, type:this.preferentialData.type,
balanceAmount:this.balanceRedece, balanceAmountSale:this.balanceRedece,
oilCardAmountSale:this.oilCardRedece, oilCardAmountSale:this.oilCardRedece,
}; };
let _this = this; let _this = this;