From 873ec92e6cfa66a3a3fab733095b24eb46097f7e Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Wed, 18 Apr 2018 15:13:04 +0800
Subject: [PATCH] fix~

---
 src/main/ui/static/invoice/invoice_assistant.js | 17 ++---------------
 .../invoice/templates/invoice_assistant.html    |  2 --
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/main/ui/static/invoice/invoice_assistant.js b/src/main/ui/static/invoice/invoice_assistant.js
index c7d81f3cd..7e63b208c 100644
--- a/src/main/ui/static/invoice/invoice_assistant.js
+++ b/src/main/ui/static/invoice/invoice_assistant.js
@@ -16,7 +16,6 @@ define(['angular','decimal'], function (angular,decimal) {
         $scope.today = new Date();
         $scope.pagination = {};
         $scope.today = new Date();
-        $scope.isAll = true;
         $scope.clients = [$scope.currentUser.client];
         if ($scope.currentUser.client.has_children) {
             $scope.params.client_ids = [$scope.currentUser.client.client_id];
@@ -25,23 +24,11 @@ define(['angular','decimal'], function (angular,decimal) {
                 clientList.forEach(function (client) {
                     $scope.clients.push(client);
                 });
-                $scope.clientIds = [];
-                $scope.clients.forEach(function (client) {
-                    $scope.clientIds.push(client.client_id);
-                });
-                $scope.params.client_ids = angular.copy($scope.clientIds);
             })
         };
         $scope.chooseClient = function (clientId) {
-            if (clientId == 'all') {
-                $scope.params.client_ids = angular.copy($scope.clientIds);
-                $scope.isAll = true;
-                $scope.chooseClientId = '';
-            } else {
-                $scope.chooseClientId = clientId;
-                $scope.params.client_ids = [clientId];
-                $scope.isAll = false;
-            }
+            $scope.chooseClientId = clientId;
+            $scope.params.client_ids = [clientId];
             $scope.loadTradeLogs(1);
         };
         $scope.chooseToday = function () {
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index ac36f28be..5689f895c 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -91,8 +91,6 @@
                                         <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                                         <div class="col-sm-10 col-xs-8">
                                             <p class="form-control-static">
-                                                <a role="button" ng-class="{'bg-primary':isAll}"
-                                                   ng-click="chooseClient('all')">All</a>
                                                 <label ng-repeat="sub in clients">
                                                     |&nbsp;<a role="button"
                                                               ng-class="{'bg-primary':sub.client_id==chooseClientId}"