Skip to content

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

no message

parent b79ecbbe
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
src/components/FinancialModule/components/BillModule.vue
View file @ af9dffa2
...@@ -65,8 +65,10 @@ ...@@ -65,8 +65,10 @@
</template> </template>
</td> </td>
</tr> --> </tr> -->
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)"> <template v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
<template v-for="(item,daIn) in GetDetail.CashierDetail"> <template v-for="(item,daIn) in GetDetail.CashierDetail">
<tr>
<td height="34px" colspan="1" class="_color_b"> <td height="34px" colspan="1" class="_color_b">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p> <p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>
</td> </td>
...@@ -88,8 +90,9 @@ ...@@ -88,8 +90,9 @@
<td height="34px" class=""> <td height="34px" class="">
{{item.Money}} {{item.Money}}
</td> </td>
</template>
</tr> </tr>
</template>
</template>
</table> </table>
</div> </div>
</template> </template>
...@@ -176,7 +179,7 @@ export default { ...@@ -176,7 +179,7 @@ export default {
this.GetDetail.DetailList.forEach(x=>{ this.GetDetail.DetailList.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 = Math.round(x.Money) x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100 // x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
...@@ -192,7 +195,8 @@ export default { ...@@ -192,7 +195,8 @@ 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 = Math.round(x.Money) // x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100 Money = parseFloat(x.Money)*100
benMoney += Money benMoney += Money
......
src/components/FinancialModule/components/ReceivablesModule.vue
View file @ af9dffa2
...@@ -59,8 +59,9 @@ ...@@ -59,8 +59,9 @@
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khbweibi')}}</span></td> <td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khbweibi')}}</span></td>
<td colspan="2" class="_font_size12">{{GetDetail.Fee}}</td> <td colspan="2" class="_font_size12">{{GetDetail.Fee}}</td>
</tr> </tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=2|| GetDetail.Type!=5)"> <template v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=2|| GetDetail.Type!=5)">
<template v-for="(item,daIn) in GetDetail.CashierDetail"> <template v-for="(item,daIn) in GetDetail.CashierDetail">
<tr>
<td height="34px" colspan="1" class="_color_b"> <td height="34px" colspan="1" class="_color_b">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p> <p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>
</td> </td>
...@@ -82,8 +83,10 @@ ...@@ -82,8 +83,10 @@
<td height="34px" class=""> <td height="34px" class="">
{{item.Money}} {{item.Money}}
</td> </td>
</template>
</tr> </tr>
</template>
</template>
</table> </table>
</div> </div>
</template> </template>
...@@ -143,7 +146,7 @@ export default { ...@@ -143,7 +146,7 @@ export default {
this.GetDetail.DetailList.forEach(x=>{ this.GetDetail.DetailList.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 = Math.round(x.Money) x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100 // x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
...@@ -159,7 +162,7 @@ export default { ...@@ -159,7 +162,7 @@ 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 = Math.round(x.Money) x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100 Money = parseFloat(x.Money)*100
benMoney += Money benMoney += Money
......
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