From 4eb69c41a0408dec83111fe06453ac7fb0876021 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 1 Mar 2018 19:36:20 +0800
Subject: [PATCH] update

---
 src/main/ui/static/analysis/templates/settlement_detail.html    | 2 +-
 .../payment/tradelog/templates/partner_settlement_dialog.html   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html
index 3e4020356..216373876 100644
--- a/src/main/ui/static/analysis/templates/settlement_detail.html
+++ b/src/main/ui/static/analysis/templates/settlement_detail.html
@@ -143,8 +143,8 @@
                         <td ng-bind="settleItem.gross_amount|currency:''"></td>
                         <td ng-bind="settleItem.rate"></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.tax_amount"></td>
                         <td ng-bind="'T+'+settleItem.clear_days"></td>
                         <td>
                             <a ui-sref=".transactions({detailId:settleItem.clear_detail_id})" title="View Transactions">
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 6a1d32745..8dd8fafaf 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -154,10 +154,8 @@
                     <td ng-bind="tr.transaction_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.clearing_amount"></td>
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
                     <td ng-bind="tr.tax_amount"></td>
-
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>
                 </tr>