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

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -864,7 +864,7 @@
     "ApproveEndTime":"Approved Time",
     "ApproveTaskList":"Approve Task List",
     "ApproveRole":"Approve Role",
-
+    "NumOfBranches":"分公司数量",
     "ConditionColumnNum": "Search Condition Column Num",
     "Condition": "Search Condition",
     "RevenueTypeConfiguration":"Revenue Type Config"

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

@@ -89,7 +89,7 @@
     "BusinessAllottedTimeTo": "营业期限截止",
     "BusinessPromition": "业务宣传费",
     "BusinessScope": "经营范围",
-    "RegStatus": "登记状态",
+    "RegStatus": "工商登记状态",
     "BusinessUnit": "所属业务线",
     "BusinessUnitDesc": "业务线",
     "BusinessUnitID": "业务线",
@@ -371,6 +371,7 @@
     "RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
     "SecondaryApprovalAmount": "二级审批金额",
     "BusinessRegistrationNumber": "Business registration number",
+    "NumOfBranches":"分公司数量",
     "ParValue": "Par Value",
     "IssuedShares": "Issued shares",
     "Directors": "Directors",
@@ -595,7 +596,7 @@
     "UpdateType": "更新方式",
     "RegistrationDate": "注册日期",
     "RegistrationLocation": "注册地址(住所)",
-    "RegistrationLocationEn": "注册地地址(住所)-英文",
+    "RegistrationLocationEn": "注册地址(住所)-英文",
     "RegistrationType": "注册类型",
     "ArchitectureType": "架构类型",
     "RemarkColon": "备注：",

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

@@ -257,7 +257,7 @@
     "OrganizationMsgClientCodeRequired": "请输入客户代码",
     "OrganizationCode": "公司代码",
     "UnifiedSocialCreditCode": "统一社会信用代码",
-    "RegistrationStatus": "登记状态",
+    "RegistrationStatus": "工商登记状态",
     "LogoutTime": "注销时间",
     "RegistrationAuthority": "登记机关",
     "ChangeType": "变更类型",

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

@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate
         var getOrgList = function () {
             orgService.getOrgListLevel().success(function (data) {
                 if (data) {
-                    $scope.DataGridSource = data;
-
+                    $scope.DataGridSource = _.filter(data, function (row) {
+                        return row.isActive == true;
+                    });
                     setSelectItems($scope.selectedKeyItems);
                 }
             });

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

-commonModule.
-controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService','equityService',
-    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService,equityService) {
+commonModule.controller('editEquityChangeModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', 'areaRegionService', '$filter', 'SweetAlert', 'regionService', 'orgService', 'enterpriseAccountService', 'organizationStructureService', 'businessUnitService', 'projectService', 'dimensionService', 'equityService',
+    function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, areaRegionService, $filter, SweetAlert, regionService, orgService, enterpriseAccountService, organizationStructureService, businessUnitService, projectService, dimensionService, equityService) {
 
         var selectedModel = '.editEquityChangeControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
 
@@ -21,12 +20,12 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
 
         };
 
-        $scope.nameKeyUp = function(){
+        $scope.nameKeyUp = function () {
             var hasSpecialChar = window.PWC.hasSpecialChar($scope.editEquityModel.name);
 
-            if (hasSpecialChar){
+            if (hasSpecialChar) {
                 $scope.editEquityModel.nameError = $translate.instant('SpecialChar');
-            } else{
+            } else {
                 $scope.editEquityModel.nameError = null;
             }
         };
@@ -41,8 +40,8 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                 rows[i].data.organizationId = $scope.editOrgModel.id;
                 updateEquity.push(rows[i].data);
             }
-            var comment = $scope.editOrgModel.comment?$scope.editOrgModel.comment:'';
-            equityService.change($scope.editOrgModel.name,comment,updateEquity).success(function (data) {
+            var comment = $scope.editOrgModel.comment ? $scope.editOrgModel.comment : '';
+            equityService.change($scope.editOrgModel.name, comment, updateEquity).success(function (data) {
                 if (data && !data.result) {
                     //SweetAlert.info("Disable", orgId);
                     SweetAlert.warning($translate.instant(data.resultMsg));
@@ -70,25 +69,25 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                 },
                 columns: [
                     {
-                        dataField : "id",
-                        visible : false,
-                        allowHeaderFiltering:false
+                        dataField: "id",
+                        visible: false,
+                        allowHeaderFiltering: false
                     },
                     {
                         dataField: "eNum",
-                        visible : false,
+                        visible: false,
                         sortOrder: "asc",
-                        allowHeaderFiltering:false
+                        allowHeaderFiltering: false
                     },
                     {
                         dataField: "organizationId",
-                        visible : false,
-                        allowHeaderFiltering:false
+                        visible: false,
+                        allowHeaderFiltering: false
                     },
                     {
                         dataField: "investorName",
                         caption: $translate.instant('InvestorName'),
-                        allowHeaderFiltering:false
+                        allowHeaderFiltering: false
                     },
                     {
                         dataField: "investorEconomicNature",
@@ -163,30 +162,29 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
                 ],
                 onContentReady: function (e) {
                     $scope.equityListInstance = e.component;
-                    var totalCount =e.component.totalCount();
-                    if(totalCount>0)
-                    {
-                        $scope.totalCount=totalCount;
+                    var totalCount = e.component.totalCount();
+                    if (totalCount > 0) {
+                        $scope.totalCount = totalCount;
                     }
                 },
-                onEditingStart: function(e) {
+                onEditingStart: function (e) {
                 },
-                onInitNewRow: function(e) {
+                onInitNewRow: function (e) {
                 },
-                onRowInserting: function(e) {
+                onRowInserting: function (e) {
                     SweetAlert.success($translate.instant('ClickEnsureTip'));
                 },
-                onRowInserted: function(e) {
+                onRowInserted: function (e) {
                 },
-                onRowUpdating: function(e) {
+                onRowUpdating: function (e) {
                     SweetAlert.success($translate.instant('ClickEnsureTip'));
                 },
-                onRowUpdated: function(e) {
+                onRowUpdated: function (e) {
                 },
-                onRowRemoving: function(e) {
+                onRowRemoving: function (e) {
                     SweetAlert.success($translate.instant('ClickEnsureTip'));
                 },
-                onRowRemoved: function(e) {
+                onRowRemoved: function (e) {
                 },
                 loadPanel: {
                     enabled: false
@@ -257,10 +255,10 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
             $(selectedModel).modal('show');
         };
 
-        var refreshEquity = function (orgId){
+        var refreshEquity = function (orgId) {
             equityService.getEquityList(orgId).success(function (equityData) {
                 $scope.EquityList = equityData;
-                if(equityData){
+                if (equityData) {
                     $scope.equityId = equityData[0].id;
                 }
                 // $scope.equityInfoGridOptions.bindingOptions.dataSource.reload();

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

@@ -125,6 +125,7 @@ controller('editEquityModalController', ['$scope', '$log', '$translate', 'uiGrid
                     },
                     {
                         dataField: "payableShareholderIdNum",
+                        visible : false,
                         caption: $translate.instant('PayableShareholderIdNum'),
                         allowHeaderFiltering: false
                     },

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

@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                         return false;
                     }
                 });
-            }
+            };
+            $('.orgAreaRequired').each( function (index,ele){
+                if(null==ele.innerText||""===ele.innerText){
+                    SweetAlert.error("请检查必填项");
+                    fail = true;
+                    return false;
+                }
+            });
 
             if(fail) return;
 
@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 });
 
                 $scope.editOrgModel = orgData;
+                $scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
 
                 // 设置地区
                 loadProvinceList();
@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
 
             if($scope.isInternational){
                 $('.localRequired').removeAttr("required");
+                $('.orgAreaRequired').removeAttr("required");
             }
 
             // set first active page is basic info
@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
         // 说明
         $scope.resources = {
             OrganizationName: $translate.instant('OrganizationName'),
+            OrganizationNameEn: $translate.instant('OrganizationNameEn'),
+            RegistrationCapital: $translate.instant('RegistrationCapital'),
+            LegalPersonName: $translate.instant('LegalPersonName'),
+            NumOfBranches: $translate.instant('NumOfBranches'),
+            BusinessScope: $translate.instant('BusinessScope'),
+            UnifiedSocialCreditCode: $translate.instant('UnifiedSocialCreditCode'),
+            Abbreviation: $translate.instant('Abbreviation'),
+            RegistrationLocationEn: $translate.instant('RegistrationLocationEn'),
+
+            PaidInCapital: $translate.instant('PaidInCapital'),
+            FoundationDate: $translate.instant('FoundationDate'),
+
+            registrationLocation: $translate.instant('RegistrationLocation'),
             OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'),
             OrganizationParent: $translate.instant('OrganizationParent'),
             OrganizationLevelType: $translate.instant('OrganizationLevelType'),
@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.isLocal = false;
             $scope.isInternational = true;
             $('.localRequired').removeAttr("required");
+            $('.orgAreaRequired').removeAttr("required");
         };
 
         $scope.changeLocal = function () {
             $scope.isLocal = true;
             $scope.isInternational = false;
             $('.localRequired').attr("required",true);
+            $('.orgAreaRequired').attr("required",true);
         };
 
         // 强制刷新机构控件里的机构
@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.trueFalse = constant.trueFalse;
             $scope.countryCNList = constant.countryCNList;
             $('.localRequired').attr("required",true);
+            $('.orgAreaRequired').attr("required",true);
 
             // $('.localRequired').attr("required","true"); required="required"
         };

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

@@ -21,6 +21,7 @@
 
         .btn-default {
             height: 33px;
+            width: 250px;
         }
 
         input {

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

@@ -1479,7 +1479,7 @@ constant.TaxpayerQualificationTypeList = [
 
 constant.RegStatusList = [
     {code: 0, type: "存续"},
-    {code: 1, type: "存续中"},
+    {code: 1, type: "注销中"},
     {code: 2, type: "已注销"}
 ];