master
wangning 7 years ago
parent 1fb82e3521
commit 4eb69c41a0

@ -143,8 +143,8 @@
<td ng-bind="settleItem.gross_amount|currency:''"></td> <td ng-bind="settleItem.gross_amount|currency:''"></td>
<td ng-bind="settleItem.rate"></td> <td ng-bind="settleItem.rate"></td>
<td ng-bind="settleItem.total_charge|currency:''"></td> <td ng-bind="settleItem.total_charge|currency:''"></td>
<td ng-bind="settleItem.tax_amount"></td>
<td ng-bind="settleItem.clearing_amount|currency:''"></td> <td ng-bind="settleItem.clearing_amount|currency:''"></td>
<td ng-bind="settleItem.tax_amount"></td>
<td ng-bind="'T+'+settleItem.clear_days"></td> <td ng-bind="'T+'+settleItem.clear_days"></td>
<td> <td>
<a ui-sref=".transactions({detailId:settleItem.clear_detail_id})" title="View Transactions"> <a ui-sref=".transactions({detailId:settleItem.clear_detail_id})" title="View Transactions">

@ -154,10 +154,8 @@
<td ng-bind="tr.transaction_amount"></td> <td ng-bind="tr.transaction_amount"></td>
<td ng-bind="tr.clearing_amount"></td> <td ng-bind="tr.clearing_amount"></td>
<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td> <td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>
<td ng-bind="tr.clearing_amount"></td>
<td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td> <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
<td ng-bind="tr.tax_amount"></td> <td ng-bind="tr.tax_amount"></td>
<td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td> <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
<td ng-bind="tr.remark"></td> <td ng-bind="tr.remark"></td>
</tr> </tr>

Loading…
Cancel
Save