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:
zhaohengkun 2024-10-18 10:04:57 +08:00
parent a40e1e29e7
commit 8746387651
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,8 +131,8 @@
<div class="box-bottom">
<div>
<div class="price_">￥{{ realAmount }}</div>
<div class="price_prefer" style="font-size: 14px">油品优惠:￥-{{ parseFloat(disOil).toFixed(2)}}</div>
<div class="price_prefer" style="font-size: 14px">商品优惠:￥-{{ parseFloat(disGoods).toFixed(2) }}</div>
<!-- <div class="price_prefer" style="font-size: 14px">油品优惠:￥-{{ parseFloat(disOil).toFixed(2)}}</div>-->
<!-- <div class="price_prefer" style="font-size: 14px">商品优惠:￥-{{ parseFloat(disGoods).toFixed(2) }}</div>-->
<div class="price_prefer">优惠合计:￥-{{ parseFloat(disTotal).toFixed(2) }}</div>
</div>
<div class="anniu" @click="settlement()" :class="{ disabled: !isClickable }">立即结算</div>
@ -1168,10 +1168,9 @@ export default {
'WECHAT': '微信',
'ALIPAY': '支付宝',
'UNIONPAY': '银联二维码',
'after_pay': '挂账',
'fule_card': '囤油卡',
'card_value': '储值卡',
'car_card_value': '车队卡',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡'
};
let payTypeText = payTypeMap[this.payType] || '小程序码';
@ -1182,15 +1181,15 @@ export default {
unitName: "", // 挂账单位
// consumeAmount:this.consumeAmount,
creditAmount: this.realAmount.toFixed(2),//挂账金额
creditAmount: (this.oilAmount + (+this.goodsAmount)).toFixed(2),//挂账金额
// 优惠合计
discount: this.disTotal.toFixed(2), // 油惠合计
discount: (this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计
// 储值卡付款
consumeAmount: this.realAmount.toFixed(2),
consumeAmount: this.consumeAmount,
// 屯油卡付款
consumeRefuelMoney: this.realAmount.toFixed(2),
consumeRefuelMoney: this.consumeRefuelMoney ? this.consumeRefuelMoney.toFixed(2) : 0,
// 实付款
actualPay: this.realAmount.toFixed(2),
actualPay: ((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2),
// 找零
seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0,
}