1、机构管理中的 其他信息修改为税务信息

2、机构管理 机构列表设置默认隐藏的列
3、机构管理中的 其他信息 添加全部展开和折叠按钮
4、区域为国际化修改了省 可空逻辑

// todo
1、机构国际化修改
2、股东搜索机构

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

@@ -91,7 +91,7 @@ public class AreaRegionServiceImpl {
                 AreaRegion provinceRegion = new AreaRegion();
                 provinceRegion.setId(CommonUtils.getUUID());
                 provinceRegion.setAreaId(area.getId());
-                provinceRegion.setRegionId(provinceId);
+                provinceRegion.setRegionId(null==provinceId?"":area.getId());
                 areaRegionMapper.insert(provinceRegion);
             }
             // city

atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json

@@ -342,7 +342,8 @@
     "TaxOfficerList": "专管员列表",
     "ReturnRate": "返还率",
     "EquityInformation": "股权信息",
-    "OrganizationExtraData": "其他信息",
+    "OrganizationExtraInfo": "其他信息",
+    "OrganizationTaxInfo": "税务信息",
     "TaxPreferentialInformation": "税收优惠信息",
     "OrganizationAdvancedOptions": "高级设置",
     "OrganizationMsgEnterpriseAccountSetRequired": "请选择企业账套",

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

@@ -3,6 +3,8 @@
         function ($scope, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region,equityService,orgExtraService) {
             'use strict';
 
+            $scope.expanded = false;
+
             $scope.startDate = new Date(2019, 0, 1);
             $scope.endDate = new Date(2019, 11, 31);
 
@@ -1766,7 +1768,7 @@
             // 编辑机构其他信息
             $scope.updateOrgExtra = function () {
                 $('.extra-org-info .control-label span').attr("hidden","hidden");
-                $('.extra-org-info .right-option button').removeAttr("hidden");
+                $('.extra-org-info .right-option .button2position').removeAttr("hidden");
                 $('.extra-org-info .right-option .updOrgBtn').attr("hidden","hidden");
                 // $('.extra-org-info .control-label input') 不是数组所以用这种方式遍历
                 for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
@@ -1779,7 +1781,7 @@
             $scope.updateOrgExtraCancel = function () {
                 $scope.selectCompanyExtra=$scope.comExtraOldData;
                 $('.extra-org-info .control-label span').removeAttr("hidden");
-                $('.extra-org-info .right-option button').attr("hidden","hidden");
+                $('.extra-org-info .right-option .button2position').attr("hidden","hidden");
                 $('.extra-org-info .right-option .updOrgBtn').removeAttr("hidden");
                 for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
                     $('.extra-org-info .control-label input')[i].style.display = "none";
@@ -2036,6 +2038,30 @@
                 DateMonthFormatError: $translate.instant('DateMonthFormatError')
             };
 
+
+            $scope.collapseOrgExtraInfoAll = function () {
+                $scope.showTaxRegInfoContent = false;
+                $scope.showTraitRegInfoContent = false;
+                $scope.showTaxRule = false;
+                $scope.showReturnRateInfo = false;
+                $scope.showAccountingRateInfo = false;
+                $scope.showApprovedLevyInfo = false;
+                $scope.showTaxOfficerInfo = false;
+                $scope.showInvoiceInfo = false;
+                $scope.expanded = false;
+            };
+            $scope.expandOrgExtraInfoAll = function () {
+                $scope.showTaxRegInfoContent = true;
+                $scope.showTraitRegInfoContent = true;
+                $scope.showTaxRule = true;
+                $scope.showReturnRateInfo = true;
+                $scope.showAccountingRateInfo = true;
+                $scope.showApprovedLevyInfo = true;
+                $scope.showTaxOfficerInfo = true;
+                $scope.showInvoiceInfo = true;
+                $scope.expanded = true;
+            };
+
             // 验证开始时间
             $scope.checkStartDate = function (row) {
 

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

@@ -63,7 +63,7 @@
                                 {{'EquityInformation' | translate}}
                             </md-nav-item>
                             <md-nav-item md-nav-click="goto('page3')" name="page3">
-                                {{'OrganizationExtraData' | translate}}
+                                {{'OrganizationTaxInfo' | translate}}
                             </md-nav-item>
                             <md-nav-item md-nav-click="goto('page4')" name="page4" hidden="hidden">
                                 {{'TaxPreferentialInformation' | translate}}
@@ -325,6 +325,12 @@
                                     <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()">
+                                                <i class="fa fa-expand" aria-hidden="true" ng-if="!expanded" ng-click="expandOrgExtraInfoAll()">&nbsp;</i>{{'ExpandAll' | translate }}
+                                            </button>
+                                            <button type="button" style="" ng-if="expanded" class="btn btn-in-grid" ng-click="collapseOrgExtraInfoAll()">
+                                                <i class="fa fa-compress" aria-hidden="true" ng-if="expanded" ng-click="collapseOrgExtraInfoAll()">&nbsp;</i>{{'CollapseAll' | translate}}
+                                            </button>
                                             <button type="button" class="updOrgBtn btn btn-in-grid"
                                                     style="width: 117px;" ng-click="updateOrgExtra()"
                                                     ng-if="hasEditPermission"><i