|
|
|
@ -1026,7 +1026,8 @@ export default {
|
|
|
|
if(item.transactionPrice){
|
|
|
|
if(item.transactionPrice){
|
|
|
|
if(item.collectionRechargeAmount){
|
|
|
|
if(item.collectionRechargeAmount){
|
|
|
|
// 卡付
|
|
|
|
// 卡付
|
|
|
|
card+=((item.collectionRechargeAmount).toFixed(2)*1)
|
|
|
|
// card+=(item.collectionRechargeAmount.toFixed(2)*1)
|
|
|
|
|
|
|
|
card = ((item.collectionRechargeAmount*1+card*1).toFixed(2)*1)
|
|
|
|
// item.rechargeAccountList.forEach(item=>{ //算上赠送金额
|
|
|
|
// item.rechargeAccountList.forEach(item=>{ //算上赠送金额
|
|
|
|
// item.giftSpendMoney?item.giftSpendMoney:0
|
|
|
|
// item.giftSpendMoney?item.giftSpendMoney:0
|
|
|
|
// card+=item.giftSpendMoney
|
|
|
|
// card+=item.giftSpendMoney
|
|
|
|
@ -1425,9 +1426,7 @@ export default {
|
|
|
|
let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0) //本次需要支付的钱
|
|
|
|
let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0) //本次需要支付的钱
|
|
|
|
if(this.useRecharge == 1){ //门店参数 按比例支付
|
|
|
|
if(this.useRecharge == 1){ //门店参数 按比例支付
|
|
|
|
// 上一次输入的没变
|
|
|
|
// 上一次输入的没变
|
|
|
|
console.log('上一次--->',this.spendMoney,'现在--->',row.spendMoney)
|
|
|
|
|
|
|
|
if(this.spendMoney === row.spendMoney){
|
|
|
|
if(this.spendMoney === row.spendMoney){
|
|
|
|
console.log('我会到这里呀！！！！')
|
|
|
|
|
|
|
|
// 上一次没改变
|
|
|
|
// 上一次没改变
|
|
|
|
row.cardOvers = (row.cardOvers - (row.spendMoney*1)).toFixed(2)*1
|
|
|
|
row.cardOvers = (row.cardOvers - (row.spendMoney*1)).toFixed(2)*1
|
|
|
|
this.updataList()
|
|
|
|
this.updataList()
|
|
|
|
@ -1448,7 +1447,6 @@ export default {
|
|
|
|
// 够支付，按比例扣除,可能赠送存在或者不存在
|
|
|
|
// 够支付，按比例扣除,可能赠送存在或者不存在
|
|
|
|
let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 )) //可用余额比例
|
|
|
|
let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 )) //可用余额比例
|
|
|
|
let giveProportion = (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
|
|
|
|
let giveProportion = (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
|
|
|
|
console.log('--------->比例',balanceProportion,giveProportion)
|
|
|
|
|
|
|
|
let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
|
|
|
|
let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
|
|
|
|
let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
|
|
|
|
let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
|
|
|
|
let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
|
|
|
|
let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
|
|
|
|
@ -2197,7 +2195,7 @@ export default {
|
|
|
|
storeId: sessionStorage.getItem("parentId")
|
|
|
|
storeId: sessionStorage.getItem("parentId")
|
|
|
|
}).then(res => {
|
|
|
|
}).then(res => {
|
|
|
|
if (res.code == "000000") {
|
|
|
|
if (res.code == "000000") {
|
|
|
|
this.memberForm = {...res.data,manNumber:1};
|
|
|
|
this.memberForm = {...res.data};
|
|
|
|
this.debtMoneys = res.data.debtMoneys;
|
|
|
|
this.debtMoneys = res.data.debtMoneys;
|
|
|
|
this.cashNumber = 1;
|
|
|
|
this.cashNumber = 1;
|
|
|
|
this.list = [];
|
|
|
|
this.list = [];
|
|
|
|
|
Wangxubin
3 years ago