bug:19196\19195\19214\19215\192161\19217\19220

atms-api/src/main/java/pwc/taxtech/atms/service/impl/StdAccountServiceImpl.java

@@ -19,10 +19,7 @@ import pwc.taxtech.atms.entity.StandardAccount;
 import pwc.taxtech.atms.entity.StandardAccountExample;
 import pwc.taxtech.atms.exception.ServiceException;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -67,7 +64,9 @@ public class StdAccountServiceImpl extends BaseService {
                     root.setExpanded(false);
                     root.setHasChildren(CollectionUtils.isNotEmpty(entry.getValue()));
                     root.setTitle(StdAccountEnum.AcctProp.MAPPING.get(entry.getKey()));
-                    root.setChildren(entry.getValue());
+                    List<StdAccountFancyTreeDto> temp = entry.getValue();
+                    root.setChildren(temp.stream().sorted(Comparator.comparing(StdAccountFancyTreeDto::getCode)).collect(Collectors.toList()));
+//                    root.setChildren(entry.getValue());
                     resultList.add(root);
                 }
             }

atms-web/src/main/webapp/app/admin/basicData/financialData/customerListManage/customer-list-manage.html

@@ -12,7 +12,7 @@
             <button class="btn btn-secondary btnImport" ng-class="{false:'no-permission'}[hasEditPermission]" ng-click="popupImportFileModel()" ng-disabled="!hasEditPermission||!hasEnterpriseAccountSet">
                 <span translate="ImportCustomerList"></span>
             </button>        
-            <export-button style="float: right; margin-right: 15px; margin-top: 7px; "><export-button>
+            <!--<export-button style="float: right; margin-right: 15px; margin-top: 7px; "><export-button>-->
 </div>
 
     </div>

atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.html

@@ -36,8 +36,8 @@
             <button type="button" class="btn btn-in-grid inline-div" ng-click="downEntepriseAccountTemplate()"><i
                     class="fa fa-download" aria-hidden="true"></i>下载模板
             </button>
-            <export-button style="float: right; margin-right: 1px; margin-top: 9px;">
-                <export-button>
+            <!--<export-button style="float: right; margin-right: 1px; margin-top: 9px;">-->
+                <!--<export-button>-->
         </div>
     </div>
     <div class="enterprise-account-list-wrap" id="enterprise-account-list-wrap" ng-show="hasEnterpriseAccountSet">

atms-web/src/main/webapp/app/admin/basicData/masterData/businessUnit/business-unit.ctrl.js

@@ -158,7 +158,7 @@
                         field: 'name',
                         name: $translate.instant('BusinessUnitName'),
                         width: '50%',
-                        cellTemplate: '<div class="business-unit-gridcell-name"><span>{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
+                        cellTemplate: '<div class="business-unit-gridcell-name" style="text-align: center"><span>{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
                     }, {
                         field: 'isActive',
                         name: $translate.instant('BusinessUnitStatus'),

atms-web/src/main/webapp/app/admin/basicData/masterData/orangizationStructureManage/orangization-structure-manage.ctrl.js

@@ -161,7 +161,7 @@
                         field: 'name',
                         name: $translate.instant('OrganizationStructureName'),
                         width: '50%',
-                        cellTemplate: '<div class="orangization-structure-gridcell-name"><span>{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
+                        cellTemplate: '<div class="orangization-structure-gridcell-name" style="text-align: center"><span style="text-align: center;float:left;">{{row.entity.name}}</span><span ng-hide="true">{{row.entity.id}}</span></div>'
                     }, {
                         field: 'isActive',
                         name: $translate.instant('OrganizationStructureStatus'),

atms-web/src/main/webapp/app/admin/basicData/masterData/orangizationStructureManage/orangization-structure-manage.html

@@ -5,7 +5,7 @@
                 <button class="btn btn-in-grid" atms-permission permission-code="{{$root.adminPermission.basicData.orangizationStructure.editCode}}" ng-click="createNewData()">
                     <i class=" material-icons">add_circle_outline</i> <span translate="OrganizationStructureAddNew"></span>
                 </button>              
-                <export-button style="float: right; margin-right: 15px; margin-top: 9px;"><export-button>
+                <!--<export-button style="float: right; margin-right: 15px; margin-top: 9px;"><export-button>-->
 </div>
 
             <div class="list-container">

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

@@ -37,12 +37,12 @@
 
             <div class="align-right" style="margin-top:5px;">
                 <!--<button class="btn btn-export" type="button" ng-click="" translate="Export"></button>-->
-                <export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>
+                <!--<export-button style="float: right; margin-left: 0px; margin-top: 7px"><export-button>-->
             </div>
             <div class="right-operate ">
                  
                 <!-- board展示 -->
-                <a class="display-user" href="#/organizationViewInfrastructure/organizationBusinessUnitView" title="{{'ShowAsCard' | translate}}"><i class="fa fa-th" aria-hidden="true"></i></a>
+                <!--<a class="display-user" href="#/organizationViewInfrastructure/organizationBusinessUnitView" title="{{'ShowAsCard' | translate}}"><i class="fa fa-th" aria-hidden="true"></i></a>-->
                 <a class="display-user border-left active" title="{{'ShowAsList' | translate}}">
                     <!-- list展示 -->
                     <i class="fa fa-list-ul" aria-hidden="true"></i>