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

收银台调整

Browse Source
This commit is contained in:
zhaohengkun 2024-10-18 10:24:06 +08:00
parent 8746387651
commit 48e0da0a92
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,11 +1415,11 @@ export default {
//油品订单金额
this.payForm.oilAmount = this.oilGunClearing.amount || 0
//商品订单金额
this.payForm.goodsAmount = this.getGoodsNum
this.payForm.goodsAmount = this.getGoodsNum || 0
//油品实付金额
this.payForm.oilActualPay = this.oilGunClearing.amount || 0
this.payForm.oilActualPay = this.oilGunClearing.amount ? this.oilGunClearing.getAmount-this.disOil : 0
//商品实付金额
this.payForm.goodsActualPay = this.getGoodsNum
this.payForm.goodsActualPay = this.getGoodsNum ? this.getGoodsNum-this.disGoods : 0
//油枪id
this.payForm.oilGunId = this.oilGunClearing.id
//活动营销优惠金额
@ -1433,9 +1433,9 @@ export default {
//付款用户
this.payForm.payUser = this.chooseVipUser.mobile
//油品优惠金额
this.payForm.oilDiscount = 0;
this.payForm.oilDiscount = this.disOil;
//商品优惠金额
this.payForm.goodsDiscount = 0;
this.payForm.goodsDiscount = this.disGoods;
//会员消费金额 (储值卡需要减少的金额)
this.payForm.consumeAmount = this.realAmount;
@ -1449,7 +1449,7 @@ export default {
//购买商品的总数量 计算属性
this.payForm.goodsNum = this.getGoodsListNum
//油品 + 商品 的实付总额
this.payForm.allAmount = this.realAmount
this.payForm.allAmount = (this.oilGunClearing.getAmount-this.disOil) + (this.getGoodsNum-this.disGoods)
this.payForm.paymentType = this.payType
@ -1929,11 +1929,11 @@ export default {
//油品订单金额
this.payForm.oilAmount = this.oilGunClearing.amount || 0
//商品订单金额
this.payForm.goodsAmount = this.getGoodsNum
this.payForm.goodsAmount = this.getGoodsNum || 0
//油品实付金额
this.payForm.oilActualPay = this.oilGunClearing.amount || 0
this.payForm.oilActualPay = this.oilGunClearing.amount ? this.oilGunClearing.getAmount-this.disOil : 0
//商品实付金额
this.payForm.goodsActualPay = this.getGoodsNum
this.payForm.goodsActualPay = this.getGoodsNum ? this.getGoodsNum-this.disGoods : 0
//油枪id
this.payForm.oilGunId = this.oilGunClearing.id
//活动营销优惠金额
@ -1947,9 +1947,9 @@ export default {
//付款用户
this.payForm.payUser = this.chooseVipUser.mobile
//油品优惠金额
this.payForm.oilDiscount = 0;
this.payForm.oilDiscount = this.disOil;
//商品优惠金额
this.payForm.goodsDiscount = 0;
this.payForm.goodsDiscount = this.disGoods;
//会员消费金额 (储值卡需要减少的金额)
this.payForm.consumeAmount = this.realAmount;
@ -1963,7 +1963,8 @@ export default {
//购买商品的总数量 计算属性
this.payForm.goodsNum = this.getGoodsListNum
//油品 + 商品 的实付总额
this.payForm.allAmount = this.realAmount
this.payForm.allAmount = (this.oilGunClearing.getAmount-this.disOil) + (this.getGoodsNum-this.disGoods)
this.payForm.paymentType = this.payType