fixed page issue -- frank

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -362,6 +362,7 @@
                 bindingOptions: {
                     dataSource: 'shareholderDatasource'
                 },
+                height:150,
                 showBorders: true,
                 paging: {
                     pageSize: constant.page.logPageSize
@@ -475,6 +476,7 @@
                 bindingOptions: {
                     dataSource: 'directorDatasource'
                 },
+                height:160,
                 showBorders: true,
                 paging: {
                     pageSize: constant.page.logPageSize

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -26,7 +26,7 @@
             <div id="basicdata" class="tab-pane in active">
                 <form class="form-horizontal" id="orgControlForm" name="orgControlForm" dx-validation-group="{}">
                     <div class="local">
-                        <div style="margin-left: 20px;margin-top: 20px">
+                        <div style="margin-left: 20px;margin-top: 15px">
                             <span style="font-weight: bold;font-size: large;">{{'EntityInfo'|translate}}</span>
                         </div>
                         <div class="bottom-row">
@@ -133,7 +133,7 @@
                     </div>
                 </form>
             </div>
-            <div id="advancedOptions" class="tab-pane fade">
+            <div id="advancedOptions" class="tab-pane fade" style="height:474px">
                 <!--Equity information-->
                 <div class="label-current-holding">
                     <label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
@@ -147,7 +147,7 @@
                 </div>
 
                 <!--Direcotr information-->
-                <div class="label-director">
+                <div class="label-director" style="margin-top: 40px">
                     <label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label>
                     <button type="button" class="btn btn-in-grid" style="width: 117px;float:right" ng-click="addDirector()">
                         <i class="material-icons middle">create</i>{{'Create' | translate}}

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less

@@ -13,7 +13,7 @@
 
   .modal-dialog {
     width: 1100px;
-    height: 600px;
+    height: 700px;
 
     .modal-body {
       height: 100%;