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

Compare commits

base: dianliang:b078191ea356ec36eb0b4c2a48c65b5f8ae703d4
Branches Tags
dianliang:main
dianliang:master
...
compare: dianliang:f516365a5afae032a87739b9e1264818bca27aea
Branches Tags
dianliang:main
dianliang:master

2 Commits
b078191ea3 ... f516365a5a

Author SHA1 Message Date
zhaohengkun
f516365a5a Merge remote-tracking branch 'origin/main' 2024-10-18 10:43:59 +08:00
zhaohengkun
a5ac9ecaa5 收银台调整 2024-10-18 10:43:49 +08:00
1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -1431,9 +1431,9 @@ export default {
//商品订单金额 //商品订单金额
this.payForm.goodsAmount = this.getGoodsNum || 0 this.payForm.goodsAmount = this.getGoodsNum || 0
//油品实付金额 //油品实付金额
this.payForm.oilActualPay = this.oilGunClearing.amount ? this.oilGunClearing.getAmount-this.disOil : 0 this.payForm.oilActualPay = (this.oilGunClearing.getAmount || 0)-(this.disOil || 0)
//商品实付金额 //商品实付金额
this.payForm.goodsActualPay = this.getGoodsNum ? this.getGoodsNum-this.disGoods : 0 this.payForm.goodsActualPay = (this.getGoodsNum || 0) - (this.disGoods || 0)
//油枪id //油枪id
this.payForm.oilGunId = this.oilGunClearing.id this.payForm.oilGunId = this.oilGunClearing.id
//活动营销优惠金额 //活动营销优惠金额
@ -1463,7 +1463,7 @@ export default {
//购买商品的总数量 计算属性 //购买商品的总数量 计算属性
this.payForm.goodsNum = this.getGoodsListNum this.payForm.goodsNum = this.getGoodsListNum
//油品 + 商品 的实付总额 //油品 + 商品 的实付总额
this.payForm.allAmount = (this.oilGunClearing.getAmount-this.disOil) + (this.getGoodsNum-this.disGoods) this.payForm.allAmount = this.realAmount
this.payForm.paymentType = this.payType this.payForm.paymentType = this.payType
@ -1977,7 +1977,7 @@ export default {
//购买商品的总数量 计算属性 //购买商品的总数量 计算属性
this.payForm.goodsNum = this.getGoodsListNum this.payForm.goodsNum = this.getGoodsListNum
//油品 + 商品 的实付总额 //油品 + 商品 的实付总额
this.payForm.allAmount = (this.oilGunClearing.getAmount-this.disOil) + (this.getGoodsNum-this.disGoods) this.payForm.allAmount = this.realAmount