Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -372,7 +372,7 @@
 
                             <div ng-show="currentNavItem==='page3'" class="org-extra-data-table">
                                 <div class="extra-org-info-wrapper">
-                                    <div class="extra-org-info">
+                                    <!--<div class="extra-org-info">-->
                                         <!--<label class="basic-label">{{'OrganizationBasicData' | translate}}</label>-->
                                         <div class="right-option">
                                             <button type="button" style="" ng-if="!expanded" class="btn btn-in-grid" ng-click="expandOrgExtraInfoAll()">
@@ -968,7 +968,7 @@
                                                       title="{{x.right.dimensionValue}}">{{x.right.dimensionValue|limitString:maxValueLength}}</span>
                                             </div>
                                         </div>-->
-                                    </div>
+                                    <!--</div>-->
 
                                     <div class="tax-rule-info-table" ng-show="!isInternational">
                                         <div class="label-tax-info border-bottom-divide">

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

@@ -430,7 +430,7 @@
 
               .org-extra-data-table {
                 max-height: 700px;
-                overflow-y: scroll;
+                //overflow-y: scroll;
 
                 .right-option {
                   height: 30px;
@@ -447,6 +447,14 @@
                 }
 
                 .extra-org-info-wrapper {
+
+                  min-width: 700px;
+                  max-width: 1400px;
+                  padding: 10px 0px;
+                  max-height: 700px;
+                  overflow-y: auto;
+                  overflow-x: hidden;
+
                   label {
                     outline: none;
                   }
@@ -456,9 +464,6 @@
                     height : 20px;
                   }
 
-                  min-width: 700px;
-                  max-width: 1400px;
-
                   .divider {
                     height: 2px;
                     overflow: hidden;
@@ -492,34 +497,30 @@
                     font-family: 'Microsoft YaHei Bold', 'Microsoft YaHei Regular', 'Microsoft YaHei';
                   }
 
-                  .extra-org-info {
-                    padding: 10px 0px;
-                    max-height: 400px;
-                    overflow-y: auto;
-                    overflow-x: hidden;
 
-                    .tax-extra-info-table{
-                      .tax-extra-info-content{
-                        .quarter-div{
-                          width: 50%;
-                          float: left;
-                          padding: 30px 10px 10px 10px;
-                          .form-group{
-                            padding-left: 0;
-                            line-height: 2em;
-                            margin-left: -15px;
-                            margin-right: -15px;
-                          }
-                        }
 
-                        .leftUp {
-                          width: 50%;
-                        }
+                  .tax-extra-info-table {
+                    .tax-extra-info-content {
+                      .quarter-div {
+                        width: 50%;
+                        float: left;
+                        padding: 30px 10px 10px 10px;
 
-                        .rightUp {
-                          width: 50%;
+                        .form-group {
+                          padding-left: 0;
+                          line-height: 2em;
+                          margin-left: -15px;
+                          margin-right: -15px;
                         }
                       }
+
+                      .leftUp {
+                        width: 50%;
+                      }
+
+                      .rightUp {
+                        width: 50%;
+                      }
                     }
                   }