fixed main page-- frank

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -5,7 +5,7 @@
 
             $scope.expanded = false;
             $scope.showOrgs = true;
-            $scope.ShowSingle=false;
+            $scope.ShowSingle = false;
             $scope.startDate = new Date(2019, 0, 1);
             $scope.endDate = new Date(2019, 11, 31);
 
@@ -1990,7 +1990,7 @@
                         // console.log($scope.DataGridSource);
                         // console.log($scope.orgUserGridOptions);
                         $scope.oldData = angular.copy(data);
-                        // $scope.setGridHeight();
+                        $scope.setGridHeight();
                     }
                 });
             };
@@ -3240,7 +3240,7 @@
                     bindingOptions: {
                         dataSource: 'DataGridSource'
                     },
-                    height:700,
+                    // height:700,
                     showBorders: true,
                     paging: {
                         pageSize: constant.page.logPageSize
@@ -3828,8 +3828,15 @@
                 //showUserTab();
                 checkUserPermission();
                 loadDatagrid();
+                $scope.location = $scope.$root.currentLanguage;
                 $timeout(function () {
                     $scope.isLoadComplete = true;
+                    if ($scope.location) {
+                        $scope.showHeader = false;
+                    }
+                    else {
+                        $scope.showHeader = true;
+                    }
                 }, 500);
             })();
         }

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

 <div class="system-manage">
-    <div class="menu-header">
+    <div class="menu-header" ng-if="showHeader">
         <div class="menu-title">{{'OrganizationManage' | translate}}</div>
         <div class="menu-log">
             <!--<a class="btn btn-not-important" href="javascript:void(0)" ng-click="showOperateLogPop()"> </a>-->

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.js

@@ -21,8 +21,12 @@
 
                     var contentHeaderHeight = parseInt($(contentHeader).css('height').replace('px', ''));
                     var pageHeight = parseInt($(pageWrapSelector).css('height').replace('px', ''));
-                    var menuHeight = parseInt($(menuSelector).css('height').replace('px', ''));
-                    var height = pageHeight - menuHeight - contentHeaderHeight - 40 + 'px';
+                    var menuHeight = 0;
+                    if (!scope.location) {
+                        menuHeight = parseInt($(menuSelector).css('height').replace('px', ''));
+                    }
+
+                    var height = pageHeight - menuHeight - contentHeaderHeight - 50 + 'px';
 
                     $(dxGridSelctor).css('max-height', height);
                 };
@@ -40,13 +44,13 @@
                         //    $rootScope.$broadcast(enums.vatEvent.layoutChanged, {});
                         //}, 700);
                     }
-                }) 
+                })
             }
         };
     }
 ]);
 
-infrastructureModule.directive('taxPayerNumberUnique', ['$q','orgService',function ($q, orgService) {
+infrastructureModule.directive('taxPayerNumberUnique', ['$q', 'orgService', function ($q, orgService) {
     return {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
@@ -78,7 +82,7 @@ infrastructureModule.directive('taxPayerNumberUnique', ['$q','orgService',functi
     }
 }]);
 
-infrastructureModule.directive('codeUnique', ['$q','orgService',function ($q, orgService) {
+infrastructureModule.directive('codeUnique', ['$q', 'orgService', function ($q, orgService) {
     return {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less

@@ -10,7 +10,7 @@
 @orange-color: #D55C1B;
 @org-content-min-height: 664px;
 @orgpage-tree-container-heght: 500px;
-@orgpage-tree-container-max-heght: 700px;
+@orgpage-tree-container-max-heght: 780px;
 @container-margin: 5px;
 @left-container: 273px;
 @gutter-width: 25px;