Merge branch 'develop'

src/main/ui/manage.html

@@ -566,7 +566,7 @@ margin-bottom: 10%;"/>
                         </li>
                         <li ui-sref-active="active"
                             ng-if="('settleTasks'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && roleNow !='compliance'">
-                            <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
+                            <a ui-sref="estimateAnalysis">
                                 <i class="fa fa fa-money"></i> <span>清算任务|Settle Tasks</span>
                             </a>
                         </li>

src/main/ui/static/analysis/settle_tasks.js

@@ -40,6 +40,12 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                         if (!$scope.currentTasks) {
                             $scope.currentTasks = [];
                         }
+                    } else {
+                        if (!ctrl.update_task) {
+                            ctrl.update_task = $interval(function () {
+                                $scope.checkProgressStatus();
+                            })
+                        }
                     }
                     let finished = $scope.progress.finished_sequence;
                     if ($scope.currentTasks && finished) {
@@ -149,7 +155,12 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 }, function (resp) {
                     commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message})
                 })
-            }
+            };
+            $scope.$on('$destroy', function () {
+                if (ctrl.update_task) {
+                    $interval.cancel(ctrl.update_task)
+                }
+            })
 
         }]);
     app.controller('batchAddMerchantsDialogCtrl', ['$scope', '$http', function ($scope, $http) {

src/main/ui/static/analysis/templates/settle_tasks_index.html

@@ -15,7 +15,8 @@
             </div>
             <div class="box-body" ng-if="progress.processing">
                 <h4>{{progress.progress_id}} - {{progress.plan_remark}}|{{progress.current_step}}</h4>
-                <uib-progressbar value="progress.progress" animate="true" max-value="100"></uib-progressbar>
+                <uib-progressbar value="progress.progress" animate="true" max-value="100">{{progress.progress}}%
+                </uib-progressbar>
             </div>
         </div>
         <div class="box box-info">
@@ -70,14 +71,18 @@
                                ng-if="task.whitelist_clients.length">
                             <thead>
                             <tr>
+                                <th>#</th>
                                 <th>Client Moniker</th>
+                                <th>Company Name</th>
                                 <th>BD Name</th>
                                 <th>Clean Days</th>
                             </tr>
                             </thead>
                             <tbody>
                             <tr ng-repeat="cli in task.whitelist_clients">
+                                <td ng-bind="$index+1"></td>
                                 <td ng-bind="cli.client_moniker"></td>
+                                <td ng-bind="cli.company_name"></td>
                                 <td ng-bind="cli.bd_user_name"></td>
                                 <td ng-bind="cli.clean_days"></td>
                             </tr>
@@ -105,7 +110,9 @@
                 <table class="table table-bordered table-striped table-hover">
                     <thead>
                     <tr>
+                        <th>#</th>
                         <th>Client Moniker</th>
+                        <th>Company Name</th>
                         <th>BD Name</th>
                         <th>Clean Days</th>
                         <th>Operation</th>
@@ -113,7 +120,9 @@
                     </thead>
                     <tbody>
                     <tr ng-repeat="cli in editingTask.whitelist_clients">
+                        <td ng-bind="$index+1"></td>
                         <td ng-bind="cli.client_moniker"></td>
+                        <td ng-bind="cli.company_name"></td>
                         <td ng-bind="cli.bd_user_name"></td>
                         <td ng-bind="cli.clean_days"></td>
                         <td>

src/main/ui/static/analysis/templates/settle_tasks_prioritylist.html

@@ -27,12 +27,16 @@
     </div>
     <div class="box box-info">
         <div class="box-header">
-            <input class="form-control" placeholder="Filter" ng-model="filters.client_moniker">
+            <div class="input-group">
+                <div class="input-group-addon">Clients: {{clients.length}}</div>
+                <input class="form-control" placeholder="Filter" ng-model="filters.client_moniker">
+            </div>
         </div>
         <div class="box-body table-responsive">
             <table class="table table-bordered table-striped">
                 <thead>
                 <tr>
+                    <th>#</th>
                     <th>Client Moniker</th>
                     <th>Merchant Name</th>
                     <th>BD Name</th>
@@ -42,6 +46,7 @@
                 </thead>
                 <tbody>
                 <tr ng-repeat="client in clients|propsFilter:filters">
+                    <td ng-bind="$index+1"></td>
                     <td ng-bind="client.client_moniker"></td>
                     <td ng-bind="client.company_name"></td>
                     <td ng-bind="client.bd_user_name"></td>

src/main/ui/static/menu/templates/main_menu.html

@@ -983,7 +983,7 @@
                     </a>
                 </div>
                 <div ng-if="('settleReport'|withModule) && (role !='compliance')" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_report.settle_report">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_report.png"/>
                             <div class="description-text">