move org to front -- frank

atms-web/src/main/webapp/Scripts/app.js

@@ -5,7 +5,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
     'ngRoute', 'ngCookies', 'ngSanitize', 'ct.ui.router.extras', 'chieffancypants.loadingBar', 'ngDraggable', 'ngFileUpload', 'LocalStorageModule', 'exceptionless',
     'app.config', 'app.common', 'app.webservices', 'app.framework', 'app.vat', 'app.invoice', 'app.cit', "app.dataImport", 'app.assetsManage', 'app.taxDocumentManage','app.backlogManage',
     'app.taxTaskManage', 'pasvaz.bindonce', 'app.vatDashboard', 'app.vatDongfeng', 'vs-repeat', 'ivh.treeview', 'angular-cache', 'app.cache', 'angularBootstrapNavTree',
-    'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage','app.dataImp','app.analysis'])
+    'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage','app.dataImp','app.analysis','app.infrastructure'])
     //run blocks are executed after the injector is created and are the first
     //methods that are executed in any Angular app.
     .run(['$log', '$http', 'CacheFactory', 'userService', 'loginContext', '$rootScope', 'vatSessionService', '$q', function ($log, $http, CacheFactory, userService, loginContext, $rootScope, vatSessionService, $q) {
@@ -280,6 +280,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
                 taxDocumentList: 'taxDocumentList',
                 backlogManage: 'backlogManage',
                 noPermissionPage: 'noPermissionPage',
+                infrastructure: 'infrastructure',
                 /// <summary>
                 /// async load translation tables into application for specified part names that required for the view.
                 /// </summary>

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -40,6 +40,14 @@ var commonModule = angular.module('app.common', ['pascalprecht.translate', 'ngAn
             type: 'text/css'
         }];
 
+        this.infrastructure = [{
+            url: '/bundles/infrastructure.js?v=' + version,
+            type: 'text/javascript'
+        }, {
+            url: '/bundles/infrastructure.less?v=' + version,
+            type: 'text/css'
+        }];
+
         this.cit = [{
             url: '/bundles/cit.js?v=' + version,
             type: 'text/javascript'

atms-web/src/main/webapp/Scripts/module-part4.js

@@ -160,4 +160,36 @@ var dataImportModule = angular.module('app.dataImport', [])
                 deepStateRedirect: true,
                 sticky: true
             });
+        }]);
+
+
+var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-select", 'ui.grid', 'ui.grid.selection', 'ui.grid.selection', 'ui.grid.treeView', 'dx', 'perfect_scrollbar', 'ngMaterial', 'app.common'])
+    .run(['$log', function ($log) {
+        $log.debug('app.infrastructure.run()...');
+
+    }])
+    .config(['$controllerProvider', '$compileProvider', '$filterProvider', '$provide', 'scriptDependencyProvider', '$stateProvider', '$stickyStateProvider',
+        function ($controllerProvider, $compileProvider, $filterProvider, $provide, scriptDependencyProvider, $stateProvider, $stickyStateProvider) {
+            'use strict';
+            // this is required to add controller/directive/filter/service after angular bootstrap
+            bindModule(infrastructureModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
+
+            $stateProvider.state({
+                name: 'organization',
+                url: '/organization',
+                views: {
+                    '@': {
+                        controller: ['$scope', '$stateParams', 'appTranslation',
+                            function ($scope, $stateParams, appTranslation) {
+                                appTranslation.load([appTranslation.infrastructure]);
+                            }],
+                        template: '<organization-manage></organization-manage>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.infrastructure),
+                deepStateRedirect: true,
+                sticky: true
+            });
+
+            $stickyStateProvider.enableDebug(true);
         }]);
\ No newline at end of file

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

@@ -5,6 +5,7 @@
 
             $scope.expanded = false;
             $scope.showOrgs = true;
+            $scope.ShowSingle=false;
             $scope.startDate = new Date(2019, 0, 1);
             $scope.endDate = new Date(2019, 11, 31);
 
@@ -3239,6 +3240,7 @@
                     bindingOptions: {
                         dataSource: 'DataGridSource'
                     },
+                    height:700,
                     showBorders: true,
                     paging: {
                         pageSize: constant.page.logPageSize
@@ -3809,10 +3811,12 @@
                 $scope.showOrgs = false;
                 console.log(org);
                 $scope.selectCompany = org;
+                $scope.ShowSingle = true;
             };
 
             $scope.showAll = function () {
                 $scope.showOrgs = true;
+                $scope.ShowSingle = false;
                 $scope.selectCompany = {};
             };
 

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

@@ -73,7 +73,7 @@
                     </div>
                 </div>
             </div>
-            <div class="detail-info" ng-if="selectCompany.name">
+            <div class="detail-info" ng-if="ShowSingle">
                 <div class="company-detail">
                     <div class="org-title">
                         <div class="company-detail-left">
@@ -490,8 +490,8 @@
         </div>
 
         <operate-log is-show="isShowLog"></operate-log>
-        <!--<edit-organization-modal operate-type="orgOperateType" is-update="isOrgUpdate"-->
-                                 <!--selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal>-->
+        <edit-organization-modal operate-type="orgOperateType" is-update="isOrgUpdate"
+                                 selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal>
         <!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"-->
                            <!--selected-organization="selectedOrg"></edit-equity-modal>-->
         <!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"-->

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

@@ -10,6 +10,7 @@
 @orange-color: #D55C1B;
 @org-content-min-height: 664px;
 @orgpage-tree-container-heght: 500px;
+@orgpage-tree-container-max-heght: 700px;
 @container-margin: 5px;
 @left-container: 273px;
 @gutter-width: 25px;
@@ -34,6 +35,29 @@
 .system-manage {
   background-color: @little-white;
 
+  .menu-header {
+    height:60px;
+    background-color: white;
+    //左侧标题
+    .menu-title {
+      width: 200px;
+      height: 40px;
+      padding: 18px 0 0 30px;
+      font-size: medium;
+      display: inline-block;
+      float: left;
+    }
+
+    //右侧日志图标
+    .menu-log {
+      padding-left: 20px;
+      padding-top: 10px;
+      display: inline-block;
+      float: right;
+      margin-right: 15px;
+    }
+  }
+
   .content-container {
     .org-manage-no-data {
       width: 200px;
@@ -86,6 +110,7 @@
         margin-top: 9px;
         overflow-y: auto;
         height: calc(~"100% - 150px");
+        max-height: @orgpage-tree-container-max-heght;
 
         .orgpage-tree .angular-ui-tree-handle {
           margin-bottom: 0px;

atms-web/src/main/webapp/app/adminModule.js

@@ -644,11 +644,7 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
                 sticky: true
             });
 
-
-
             $stickyStateProvider.enableDebug(true);
-
-
         }]);
 
 //basicDataModule module create

atms-web/src/main/webapp/app/framework/app-nav/app-nav.html

@@ -28,8 +28,8 @@
             </a>
         </div>
         <div class="nav-element-left" ng-if="menuEntityManagementShow">
-            <a ui-sref="entityManagement">
-                <span class="nav-icon-color">{{'MenuEntityManagement' | translate}}</span>
+            <a ui-sref="organization">
+                <span class="nav-icon-color">{{'EntityManagement' | translate}}</span>
             </a>
         </div>