From dc9b211ae3f1ae1d8465a56c973f71023101f9bb Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 09:36:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8B=BE=E9=80=89=E5=8F=91=E9=80=81=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=8F=96=E6=B6=88=E6=AF=8F=E6=97=A5=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/clearing-log.js              | 9 ++-------
 .../analysis/templates/settlement_send_check_code.html   | 5 ++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 5ad0a7347..7173f8632 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -497,6 +497,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         $scope.settleLogs = settleLogs.map(log => {
             let info = {
                 'id': log.clearing_id,
+                'time':log.operate_time,
+                'amount':log.net_amount,
                 'remark': log.plan_detail.remark || log.plan_detail.plan_id,
                 'send': false
             };
@@ -507,13 +509,6 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         };
         $scope.sendCheckCodeButton = false;
         $scope.sendMailButton = false;
-        $scope.check_code = '';
-        $scope.sendCheckCode = function () {
-            $scope.error_msg = '';
-            $http.get('/sys/settlement/reports/send_checkcode').then(function (resp) {
-            });
-            $scope.sendCheckCodeButton = true;
-        };
 
         $scope.sendSettlementMail = function () {
             $scope.error_msg = '正在发送，请稍后。';
diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 630ede11d..0d17de1de 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -5,7 +5,10 @@
     <div class="text-center" >
         <div class="col-sm-12">
             <ul class="list-group">
-                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">[{{log.remark}}]log.clearing_id</li>
+                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
+                    <span>[{{log.remark}}]log.clearing_id</span>
+                    <span class="pull-right" ng-bind="log.net_amount|currency:''"></span>
+                </li>
             </ul>
         </div>
         <div class="col-sm-12">