fixed org -- frank

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js

@@ -323,19 +323,6 @@
                             dataField: "taxPayerNumber",
                             allowHeaderFiltering: true,
                             caption: $translate.instant('TaxPayerNumber')
-                            //headerFilter: {
-                            //    dataSource: {
-                            //        load: function () {
-                            //            return [{
-                            //                text: hasTaxpayNumer,
-                            //                 value: [['taxPayerNumber', '<>', null],'and', ['taxPayerNumber', '<>', '']]
-                            //            }, {
-                            //                text: noTaxpayNumer,
-                            //                value: [['taxPayerNumber', '=', null], 'or', ['taxPayerNumber', '=', '']]
-                            //            }];
-                            //        }
-                            //    }
-                            //},
                         },
                         {
                             dataField: "structureName",
@@ -796,18 +783,12 @@
                     loadPanel: {
                         enabled: false
                     },
-                    // scrolling: {
-                    //     mode: "virtual"
-                    // },
-                    // keyExpr: "id",
-                    // parentIdExpr: "parentID",
                     selection: {
                         mode: "single"
                     },
                     grouping: {
                         autoExpandAll: false
                     },
-                    // autoExpandAll:true,
                     allowColumnResizing: true,
                     columnAutoWidth: true,
                     showRowLines: true,
@@ -830,11 +811,6 @@
                             selectAllText: $translate.instant('SelectAll')
                         }
                     }
-                    //columnHidingEnabled: true, //自定义显示列
-                    //columnChooser: {
-                    //    enabled: true,
-                    //    mode: "select"
-                    //},
                 };
 
                 $scope.getDetailGridSettings = function (key) {

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

@@ -13,6 +13,20 @@
             controller: 'OrganizationManageController',
             link: function (scope, element, attrs, $element) {
 
+                scope.setGridHeight = function () {
+                    var pageWrapSelector = ".system-manage";
+                    var menuSelector = ".menu-header";
+                    var contentHeader = '.content-container .org-right-container';
+                    var dxGridSelctor = "#orgGridContainer";
+
+                    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';
+
+                    $(dxGridSelctor).css('max-height', height);
+                };
+
                 //https://github.com/nathancahill/Split.js/
                 Split(['#org-left-container', '#org-right-container'], {
                     //An array of initial sizes of the elements, specified as percentage values. Example: Setting the initial sizes to 25% and 75%.

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

@@ -131,6 +131,94 @@
       height: 100%;
       float: right;
 
+      .org-list {
+        border-radius: 5px;
+        padding: 4px;
+        background-color: white;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .org-title {
+          margin: 8px 5px 0px 5px;
+          padding-bottom: 10px;
+          border-bottom: 1px solid #CDCDCD;
+
+          .company-detail-left {
+            display: inline-block;
+            vertical-align: top;
+          }
+
+          .company-detail-right {
+            display: inline-block;
+            margin-left: 10px;
+            vertical-align: middle;
+
+            .company-name {
+              position: relative;
+              font-family: "Microsoft YaHei Bold", "Microsoft YaHei";
+              font-weight: 700;
+              font-style: normal;
+              font-size: 18px;
+              color: #0d0d0d;
+              height: 48px;
+              padding-top: 8px;
+            }
+          }
+
+          .right-option {
+            height: 30px;
+            display: inline-block;
+            vertical-align: middle;
+            float: right;
+
+            .right-operate {
+              margin-left: 20px;
+              margin-right: 15px;
+              display: inline-block;
+              border: 1px solid @color-light-gray-e4;
+
+              .display-user {
+                background-color: white;
+                padding: 6px 8px;
+                display: inline-block;
+              }
+
+              .border-left {
+                border-left: 1px solid @color-light-gray-e4;
+              }
+            }
+
+            #organizationIsActiveBtn {
+              background-image: none;
+
+              .material-icons {
+                font-weight: bold;
+                color: red;
+              }
+            }
+          }
+        }
+
+        .user-grid{
+          .createEntityBtn{
+            z-index: 2;
+            position: absolute;
+
+            .btn-up-grid{
+              height: 36px;
+              padding: 0 10px;
+              border-radius: 5px;
+              outline:none;
+            }
+          }
+
+          .grid-container{
+            margin-top: 10px;
+          }
+        }
+      }
+
       .detail-info {
         border-radius: 5px;
         padding: 4px;

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

@@ -367,8 +367,6 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
                 sticky: true
             });
 
-
-
             //用户明细
             $stateProvider.state({
                 name: 'userDetail',