Skip to content

S
SuperMan
Commit 07d127f8 authored by youjie's avatar youjie
Browse files
Options

no message

parent 51dfe480
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 5 deletions
src/components/FinancialModule/components/BillModule.vue
View file @ 07d127f8
...@@ -180,8 +180,12 @@ export default { ...@@ -180,8 +180,12 @@ export default {
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
// x.Money = x.Money.toFixed(2) // x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100 // x.Money = Math.round(x.Money * 100) / 100
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4)) let FractionalPart = String(x.Money).split('.')
if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
}else{
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
}
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney); this.currentMoney += parseFloat(x.OriginalMoney);
Money = parseFloat(x.Money)*100 Money = parseFloat(x.Money)*100
...@@ -196,7 +200,12 @@ export default { ...@@ -196,7 +200,12 @@ export default {
this.GetDetail.CashierDetail.forEach(x=>{ this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4)) let FractionalPart = String(x.Money).split('.')
if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
}else{
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
}
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100 Money1 = parseFloat(x.Money)*100
......
src/components/FinancialModule/components/ReceivablesModule.vue
View file @ 07d127f8
...@@ -146,7 +146,12 @@ export default { ...@@ -146,7 +146,12 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4)) let FractionalPart = String(x.Money).split('.')
if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
}else{
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
}
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
this.currentMoney += parseFloat(x.OriginalMoney); this.currentMoney += parseFloat(x.OriginalMoney);
...@@ -163,7 +168,12 @@ export default { ...@@ -163,7 +168,12 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney x.Money = x.Rate*x.OriginalMoney
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4)) let FractionalPart = String(x.Money).split('.')
if(FractionalPart.length>1&&FractionalPart[1].length>3&&FractionalPart[1].slice(3,4)>5){
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(4))
}else{
x.Money = this.RoundItUp(parseFloat(x.Money).toFixed(3))
}
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100 Money1 = parseFloat(x.Money)*100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment