Skip to content

S
SuperMan
Commit d4ef5c76 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 1d3529fa da7fb096
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 2 deletions
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ d4ef5c76
......@@ -207,6 +207,16 @@
<td height="26px"></td>
<td height="26px"></td>
</tr>
<tr>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px">{{currentMoney}}</td>
<td height="26px"></td>
<td height="26px">{{benMoney}}</td>
<td height="26px"></td>
</tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1">
<td height="34px" class="">交易方式</td>
<td height="34px" colspan="7" class="_color_b">
......@@ -300,6 +310,8 @@ export default {
EndDate:'',
StartDate:'',
printTime:'',
currentMoney:0,
benMoney:0,
}
},created(){
let date = new Date(),
......@@ -347,8 +359,12 @@ export default {
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
x.Money = x.Money.toFixed(2)
x.OriginalMoney = x.OriginalMoney.toFixed(2)
x.OriginalMoney = x.OriginalMoney.toFixed(2);
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ d4ef5c76
......@@ -182,6 +182,16 @@
<td height="26px"></td>
<td height="26px"></td>
</tr>
<tr>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px">{{currentMoney}}</td>
<td height="26px"></td>
<td height="26px">{{benMoney}}</td>
<td height="26px"></td>
</tr>
<tr>
<td colspan="1">手续费<br/><span class="_font_size12">（原币）</span></td>
<td colspan="3" class="_font_size12" >{{GetDetail.OriginalFee}}</td>
......@@ -278,7 +288,9 @@ export default {
EmployeeId:'',
EndDate:'',
StartDate:'',
printTime:''
printTime:'',
currentMoney:0,
benMoney:0,
}
},created(){
let date = new Date(),
......@@ -334,7 +346,11 @@ export default {
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2));
x.Money = x.Money.toFixed(2);
x.OriginalMoney = x.OriginalMoney.toFixed(2);
this.currentMoney += parseFloat(x.OriginalMoney);
this.benMoney += parseFloat(x.Money);
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
// let m = data.PayMoney?data.PayMoney:data.Money;
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
......
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