save data to org -- frank

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

@@ -26,8 +26,8 @@
             $scope.editOrgExtraModel = {};
 
             var translate = {
-                Enabled: $translate.instant('BusinessUnitActive'),  //已启用
-                Disabled: $translate.instant('BusinessUnitDisabled')//已停用
+                Enabled: $translate.instant('Actived'),  //已启用
+                Disabled: $translate.instant('Disabled')//已停用
             };
 
             //jack
@@ -613,7 +613,9 @@
                         {
                             dataField: "dateOfIncorporation",
                             caption: $translate.instant('dateOfIncorporation'),
-                            allowHeaderFiltering: false
+                            allowHeaderFiltering: false,
+                            dataType: "date",
+                            format: "yyyy-MM-dd"
                         },
                         {
                             dataField: "jurisdictionOfFormation",
@@ -696,6 +698,7 @@
 
             $scope.showAll = function () {
                 $scope.showOrgs = true;
+                getOrgList();
                 $scope.showSingle = false;
                 $scope.selectCompany = {};
             };
@@ -704,6 +707,14 @@
 
             };
 
+            $scope.exportOrgs = function () {
+
+            };
+
+            $scope.refreshOrg = function () {
+                getOrgList();
+            };
+
             (function initialize() {
                 $log.debug('organizationManageController.ctor()...');
                 $scope.title = $translate.instant('OrganizationManageTitle');

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

@@ -50,11 +50,11 @@
                             {{'EntityList'||translate}}</p>
                     </div>
                     <div class="right-option">
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="updateOrg()" id="orgListRefreshBtn">
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="refreshOrg()" id="orgListRefreshBtn">
                             <i class="dx-icon-refresh"></i>{{'Refresh' | translate}}
                         </button>
                         <button type="button" id="organizationExportBtn"
-                                class="btn btn-in-grid" ng-click="updateIsActive()"><i
+                                class="btn btn-in-grid" ng-click="exportOrgs()"><i
                                 class="dx-icon-export"></i>{{'Export'||translate}}
                         </button>
                         <span class="right-operate"></span>

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1689,27 +1689,27 @@ constant.EnumTaxEventType = {
 
 constant.organizationHK = {
     legalFormTypeList: [
-        {code: 1, type: "LimitedPartnership"},
-        {code: 2, type: "LimitedCompany"},
+        {code: 1, type: "Limited Partnership"},
+        {code: 2, type: "Limited Company"},
         {code: 3, type: "Trustee"}
     ],
     EntityLevel: [
-        {code: 1, type: "InvestmentFund"},
-        {code: 2, type: "InvestmentHolding"},
-        {code: 3, type: "PortfolioCompany"}
+        {code: 1, type: "Investment Fund"},
+        {code: 2, type: "Investment Holding"},
+        {code: 3, type: "Portfolio Company"}
     ],
     JurisdictionOfFormation: [
-        {code: 1, type: "HongKong"},
-        {code: 2, type: "BritishVirginIslands"},
-        {code: 3, type: "CaymanIslands"}
+        {code: 1, type: "Hong Kong"},
+        {code: 2, type: "British Virgin Islands"},
+        {code: 3, type: "Cayman Islands"}
     ],
     OwnershipForm: [
-        {code: 1, type: "OrdinaryShares"},
-        {code: 2, type: "PreferenceShares"}
+        {code: 1, type: "Ordinary Shares"},
+        {code: 2, type: "Preference Shares"}
     ],
     BoardMeetingRequirement: [
         {code: 1, type: "Annual"},
-        {code: 2, type: "SemiQnnual"},
+        {code: 2, type: "Semi Qnnual"},
         {code: 3, type: "Quarter"},
         {code: 4, type: "Monthly"}
     ],