Skip to content

S
SuperMan
Commit 21625512 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents ab897152 7e85cc5c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/components/FinancialModule/components/BillModule.vue
View file @ 21625512
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<td height="26px"></td> <td height="26px"></td>
<td height="26px">{{benMoney}}</td> <td height="26px">{{benMoney}}</td>
</tr> </tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length"> <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
<td height="26px"></td> <td height="26px"></td>
<td height="26px"></td> <td height="26px"></td>
<td height="26px"></td> <td height="26px"></td>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</template> </template>
</td> </td>
</tr> --> </tr> -->
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length"> <tr 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">
<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>
......
src/components/FinancialModule/components/ReceivablesModule.vue
View file @ 21625512
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<td height="26px"></td> <td height="26px"></td>
<td height="26px">{{benMoney}}</td> <td height="26px">{{benMoney}}</td>
</tr> </tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length"> <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=2|| GetDetail.Type!=5)">
<td height="26px"></td> <td height="26px"></td>
<td height="26px"></td> <td height="26px"></td>
<td height="26px"></td> <td height="26px"></td>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<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"> <tr 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">
<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>
......
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