no message
This commit is contained in:
wangh
parent
2a6abf3b57
commit
5d22a35b1b
@ -8,11 +8,17 @@
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
||||
<el-form-item label="交班方式" prop="status">
|
||||
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
|
||||
<el-option label="统一交班" value="统一交班">统一交班</el-option>
|
||||
<el-option label="个人交班" value="个人交班">个人交班</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交班员工" prop="staffId">
|
||||
<el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班方式" clearable>
|
||||
<el-option
|
||||
v-for="option in shiftHandoverList"
|
||||
:key="option.dictCode"
|
||||
:label="option.dictLabel"
|
||||
:value="option.dictLabel"
|
||||
v-for="option in staffList"
|
||||
:key="option.id"
|
||||
:label="option.realName"
|
||||
:value="option.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -43,8 +49,6 @@
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<!-- style="width: 1500px"-->
|
||||
|
||||
<el-card style="margin-top: 20px" class="box-card">
|
||||
<el-table
|
||||
ref="tables"
|
||||
@ -103,6 +107,7 @@ import {getHandoverListApi,printLocallyApi} from "@/api/handover/handover";
|
||||
import {getStatisticsApi } from "@/api/order/order";
|
||||
import {getDicts} from "@/api/order/data";
|
||||
import HandoverOnly from "@/views/handover/HandoverOnly.vue";
|
||||
import {listStaff} from "@/api/order/staff";
|
||||
|
||||
export default {
|
||||
name: "pointsCashier",
|
||||
@ -131,7 +136,7 @@ export default {
|
||||
defaultSort: {prop: 'createTime', order: 'descending'},
|
||||
|
||||
total: 0,
|
||||
|
||||
staffList:[],
|
||||
statisticsForm: {
|
||||
num:0,
|
||||
exchangeQuantity:0,
|
||||
@ -144,6 +149,7 @@ export default {
|
||||
this.getList();
|
||||
this.getStatistics();
|
||||
this.getStatus();
|
||||
this.getStaffList();
|
||||
},
|
||||
methods: {
|
||||
getList(){
|
||||
@ -177,6 +183,14 @@ export default {
|
||||
this.getList();
|
||||
|
||||
},
|
||||
getStaffList() {
|
||||
listStaff(this.addDateRange({ page: 1,
|
||||
pageSize: 10000})).then(response => {
|
||||
this.staffList = response.data.records;
|
||||
|
||||
}
|
||||
);
|
||||
},
|
||||
resetQuery(){
|
||||
this.queryParams = {
|
||||
giftName: '',
|
||||
@ -187,6 +201,7 @@ export default {
|
||||
pageSize:10
|
||||
},
|
||||
this.dateRange = []
|
||||
this.getList();
|
||||
},
|
||||
printLocally(data) {
|
||||
printLocallyApi(data).then(res=>{
|
||||
|
||||
@ -58,11 +58,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilPaid : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>油品优惠(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilDiacount : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品优惠(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilDiacount : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>抹零总额(实收)</div>-->
|
||||
<!-- <div>￥2164.55</div>-->
|
||||
@ -75,11 +75,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>会员储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>会员储值(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>会员储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardPaid : '0' }}</div>
|
||||
@ -90,11 +90,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值赠送(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>储值赠送(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>储值赠送(实际)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftPaid : '0' }}</div>
|
||||
@ -107,11 +107,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>存油储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>存油储值(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>存油储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelPaid : '0' }}</div>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<el-option label="未支付" value="unpaid">未支付</el-option>
|
||||
<el-option label="付款成功" value="paid">付款成功</el-option>
|
||||
<el-option label="付款失败" value="payFail">付款失败</el-option>
|
||||
</el-select>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="手机号码" prop="giftName">
|
||||
<el-input
|
||||
@ -27,7 +27,7 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="注册时间">
|
||||
<el-form-item label="时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
style="width: 240px"
|
||||
@ -197,8 +197,7 @@ export default {
|
||||
this.$forceUpdate()
|
||||
},
|
||||
getStatistics() {
|
||||
|
||||
getStatisticsApi({orderType: 1}).then(res=>{
|
||||
getStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
|
||||
this.statisticsForm = res.data
|
||||
})
|
||||
},
|
||||
@ -206,6 +205,7 @@ export default {
|
||||
handleUpdate(){},
|
||||
handleQuery(){
|
||||
this.getList();
|
||||
this.getStatistics();
|
||||
|
||||
},
|
||||
resetQuery(){
|
||||
@ -218,7 +218,9 @@ export default {
|
||||
pageSize:10
|
||||
},
|
||||
this.dateRange = []
|
||||
this.getList();
|
||||
this.getList()
|
||||
this.getStatistics();
|
||||
|
||||
},
|
||||
handleDetail(data){
|
||||
this.openDetail = true
|
||||
|
||||
@ -40,6 +40,8 @@
|
||||
<!-- <result property="addrName" column="addrName" jdbcType="VARCHAR"/>-->
|
||||
<!-- <result property="addrMobile" column="addrMobile" jdbcType="VARCHAR"/>-->
|
||||
<result property="address" column="address" jdbcType="VARCHAR"/>
|
||||
<result property="actualPayment" column="actual_payment" jdbcType="VARCHAR"/>
|
||||
<result property="makeChange" column="make_change" jdbcType="VARCHAR"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
@ -73,6 +75,9 @@
|
||||
io.update_time,
|
||||
io.courier_companies,
|
||||
io.the_tracking_number,
|
||||
io.actual_payment,
|
||||
io.make_change,
|
||||
io.payment_type,
|
||||
mu.mobile,
|
||||
mu.user_no,
|
||||
mu.name,
|
||||
|
||||
@ -447,7 +447,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
|
||||
|
||||
// 首先判断是否足够积分
|
||||
LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(nowAccountInfo.getId(), integralOrdersList.getChainStoreId());
|
||||
if (ljUserVos.getPoints() <= integralOrdersList.getAllPoints()) {
|
||||
if (Double.valueOf(ljUserVos.getPoints()).compareTo(integralOrdersList.getAllPoints()) <0 ) {
|
||||
integralOrdersList.getIntegralOrdersList().get(0).setStatus("un");
|
||||
applet.put("code", "error");
|
||||
applet.put("msg", "积分不足");
|
||||
|
||||
@ -126,6 +126,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
|
||||
refuelConsumptionAmountMap.put("oilName", oilNumber.getOilName() + oilNumber.getOilType());
|
||||
refuelConsumptionAmountMap.put("amount", 0);
|
||||
refuelConsumptionAmountMap.put("integral", 0);
|
||||
refuelConsumptionAmountMap.put("oilNameId",oilNumber.getId());
|
||||
refuelConsumptionAmountList.add(refuelConsumptionAmountMap);
|
||||
}
|
||||
String refuelConsumptionAmount = JSON.toJSONString(refuelConsumptionAmountList);
|
||||
|
||||
@ -2,6 +2,7 @@ package com.fuint.business.order.entity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fuint.repository.model.base.BaseEntity;
|
||||
import lombok.Data;
|
||||
@ -43,6 +44,10 @@ public class HandoverRecord extends BaseEntity {
|
||||
|
||||
private Integer storeId;
|
||||
|
||||
@TableField(exist = false
|
||||
)
|
||||
private String realName;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@
|
||||
<result property="updateBy" column="update_by" jdbcType="INTEGER"/>
|
||||
<!-- <result property="staffName" column="real_name" jdbcType="VARCHAR"/>-->
|
||||
<result property="type" column="type" jdbcType="VARCHAR"/>
|
||||
<result property="status" column="real_name" jdbcType="VARCHAR"/>
|
||||
<result property="status" column="status" jdbcType="VARCHAR"/>
|
||||
<result property="realName" column="real_name" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<!--查询单个-->
|
||||
@ -63,6 +64,10 @@
|
||||
</if>
|
||||
<if test="staffId != null">
|
||||
and staff_id = #{staffId}
|
||||
and status = '个人交班'
|
||||
</if>
|
||||
<if test="staffId == null">
|
||||
and status = '统一交班'
|
||||
</if>
|
||||
<if test="recordData != null and recordData != ''">
|
||||
and record_data = #{recordData}
|
||||
@ -379,6 +384,14 @@ limit 1
|
||||
a.staffId AS staffId,
|
||||
sum( a.numberOfDeals ) AS numberOfDeals,
|
||||
SUM( a.paidAmount) AS paidAmount,
|
||||
SUM(IF(a.flag ='oil', a.numberOfDeals,0)) oilN,
|
||||
SUM(IF(a.flag ='oil', a.paidAmount,0)) oilP,
|
||||
SUM(IF(a.flag ='card', a.numberOfDeals,0)) cardN,
|
||||
SUM(IF(a.flag ='card', a.paidAmount,0)) cardP,
|
||||
SUM(IF(a.flag ='fuel', a.numberOfDeals,0)) fuelN,
|
||||
SUM(IF(a.flag ='fuel', a.paidAmount,0)) fuelP,
|
||||
SUM(IF(a.flag ='goods', a.numberOfDeals,0)) goodsN,
|
||||
SUM(IF(a.flag ='goods', a.paidAmount,0)) goodsP,
|
||||
ms.real_name name
|
||||
from
|
||||
(SELECT
|
||||
@ -424,26 +437,26 @@ limit 1
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY
|
||||
staff_id UNION ALL
|
||||
|
||||
SELECT
|
||||
'point' AS flag,
|
||||
staff_id staffId,
|
||||
count( STATUS = 'paid' ) numberOfDeals,
|
||||
SUM(IF(status='status', amount, 0)) AS paidAmount
|
||||
FROM
|
||||
integral_orders
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY payment_type
|
||||
having staff_id is not null
|
||||
staff_id
|
||||
) AS a
|
||||
left join mt_staff ms ON a.staffId = ms.id
|
||||
GROUP BY a.staffId
|
||||
HAVING a.staffId is not null
|
||||
</select>
|
||||
|
||||
<!-- UNION ALL-->
|
||||
|
||||
<!-- SELECT-->
|
||||
<!-- 'point' AS flag,-->
|
||||
<!-- staff_id staffId,-->
|
||||
<!-- count( STATUS = 'paid' ) numberOfDeals,-->
|
||||
<!-- SUM(IF(status='status', amount, 0)) AS paidAmount-->
|
||||
<!-- FROM-->
|
||||
<!-- integral_orders-->
|
||||
<!-- where store_id = #{storeId}-->
|
||||
<!-- and create_time BETWEEN #{startTime} AND #{endTime}-->
|
||||
<!-- GROUP BY payment_type-->
|
||||
<!-- having staff_id is not null-->
|
||||
<select id="billingDetails" resultType="java.util.Map">
|
||||
select
|
||||
cu.unit_name name,
|
||||
|
||||
@ -315,13 +315,18 @@
|
||||
<div class="boloicon">员工统计</div>
|
||||
<div class="input-hui-frou">
|
||||
<div>员工姓名</div>
|
||||
<div>笔数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
<!-- <div>笔数</div>-->
|
||||
<div>充值(笔数/金额)</div>
|
||||
<div>加油(笔数/金额)</div>
|
||||
<div>商品(笔数/金额)</div>
|
||||
<div style="text-align: right">总笔数/总金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou" v-for="item in employeeStatistics()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
<div>{{item.cardN+item.fuelN}}/￥{{item.cardP+item.fuelP}}</div>
|
||||
<div>{{item.oilN}}/￥{{item.oilP}}</div>
|
||||
<div>{{item.goodsN}}/￥{{item.goodsP}}</div>
|
||||
<div style="text-align: right">{{item.numberOfDeals}}/￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
@ -428,6 +433,7 @@ import SelectStaff from "@/components/local/selectStaff.vue";
|
||||
staffId:'',
|
||||
staffName:null
|
||||
}
|
||||
this.getHandover()
|
||||
},
|
||||
// 选择员工
|
||||
chooseStaff() {
|
||||
@ -437,7 +443,7 @@ import SelectStaff from "@/components/local/selectStaff.vue";
|
||||
this.openStaff = false
|
||||
|
||||
this.staff.staffId = data.mtStaffId,
|
||||
this.staff.staffName = data.realName
|
||||
this.staff.staffName = data.realName
|
||||
console.log("realName",this.staff.staffName)
|
||||
this.getHandover();
|
||||
},
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交班员工" prop="staffId">
|
||||
<el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班方式" clearable>
|
||||
<el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班员工" clearable>
|
||||
<el-option
|
||||
v-for="option in staffList"
|
||||
:key="option.id"
|
||||
@ -60,6 +60,7 @@
|
||||
<el-table-column label="班次员工" align="center" prop="staffName"/>
|
||||
<el-table-column label="开始时间" align="center" prop="startTime"/>
|
||||
<el-table-column label="结束时间" align="center" prop="endTime" />
|
||||
<el-table-column label="交班方式" align="center" prop="status" />
|
||||
<el-table-column label="交班状态" align="center" prop="status" width="">
|
||||
<template slot-scope="scope">
|
||||
<el-tag effect="plain" v-if="scope.row.type =='0'"> 已交班</el-tag>
|
||||
|
||||
@ -75,11 +75,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>会员储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>会员储值(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>会员储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardPaid : '0' }}</div>
|
||||
@ -90,11 +90,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值赠送(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>储值赠送(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>储值赠送(实际)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftPaid : '0' }}</div>
|
||||
@ -107,11 +107,11 @@
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>存油储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>存油储值(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<div class="input-box">
|
||||
<div>存油储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelPaid : '0' }}</div>
|
||||
|
||||
@ -1000,6 +1000,8 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
},
|
||||
// 确定收款
|
||||
async collection() {
|
||||
let isPayFlag = false
|
||||
|
||||
let this_ = this
|
||||
|
||||
let actualPayment = 0
|
||||
@ -1049,7 +1051,6 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
}
|
||||
});
|
||||
if (flag) return
|
||||
|
||||
let timer = setInterval(async () => {
|
||||
await getCheckTheStatusOfYourPaymentByIntegralApi({orderNumber:orderNumber}).then(response => {
|
||||
if (response.data!=null){
|
||||
@ -1058,7 +1059,10 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
}
|
||||
if (response.data.status == "paid"){
|
||||
this_.isPaySuccess = true;
|
||||
isPayFlag = true
|
||||
this_.isQuery = false;
|
||||
clearInterval(timer);
|
||||
// this_.printLocally()
|
||||
}
|
||||
if (response.data.status == "payFail"){
|
||||
this_.isPaySuccess = false;
|
||||
@ -1072,7 +1076,13 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
if (this_.isQuery == false) {
|
||||
this_.loading = false;
|
||||
this_.isPay = false;
|
||||
console.log("isPayFlag",isPayFlag)
|
||||
if (isPayFlag) {
|
||||
this_.printLocally()
|
||||
isPayFlag = false
|
||||
}
|
||||
clearInterval(timer);
|
||||
clearInterval(timer2);
|
||||
clearTimeout(timer3);
|
||||
}
|
||||
},500)
|
||||
@ -1088,12 +1098,11 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
|
||||
},15000)
|
||||
|
||||
}
|
||||
if (this.isPaySuccess) {
|
||||
this.printLocally()
|
||||
// console.log("isPayFlag",isPayFlag)
|
||||
|
||||
}
|
||||
|
||||
|
||||
// this.paymentType = ''
|
||||
},
|
||||
// 获取优惠券列表信息
|
||||
@ -1145,6 +1154,7 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
this.authCode = '';
|
||||
},
|
||||
async printLocally(data) {
|
||||
console.log("111111111111111111111111111111111111111111111")
|
||||
if (!connectFlag){
|
||||
return
|
||||
}
|
||||
@ -1220,8 +1230,9 @@ import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
fromHtml = bodyStyle+this.$refs.report.innerHTML
|
||||
|
||||
|
||||
|
||||
// LODOP.PRINT_INITA(0, 0, 665, 600, '模板设计')
|
||||
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
|
||||
// LODOP.SET_PRINT_PAGESIZE(100,100,100,100)
|
||||
|
||||
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
|
||||
|
||||
|
||||
@ -59,6 +59,18 @@
|
||||
</template>
|
||||
{{ dataForm.updateTime }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if="dataForm.paymentType == 'CASH'">
|
||||
<template slot="label">
|
||||
现金支付
|
||||
</template>
|
||||
{{ dataForm.actualPayment }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if="dataForm.paymentType == 'CASH'">
|
||||
<template slot="label">
|
||||
现金支付找零
|
||||
</template>
|
||||
{{ dataForm.makeChange }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
付款备注
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="注册时间">
|
||||
<el-form-item label="时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
style="width: 240px"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user