Skip to content

T
traffic-front
Commit db5bc9ac authored by Cheng C Yang's avatar Cheng C Yang
Browse files
Options

Orange Heap

parent d0664531
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 36 deletions
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ db5bc9ac
......@@ -597,12 +597,12 @@
caption: $translate.instant('PayableShareholderName'),
allowHeaderFiltering: false
},
// {
// dataField: "payableShareholderIdNum",
// visible : false,
// caption: $translate.instant('PayableShareholderIdNum'),
// allowHeaderFiltering: false
// },
{
dataField: "payableShareholderIdNum",
visible : false,
caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false
},
{
dataField: "payableCapitalContributionAmount",
caption: $translate.instant('PayableCapitalContributionAmount'),
......
atms-web/src/main/webapp/app/common/controls/edit-equity-change-modal/edit-equity-change-modal.ctrl.js
View file @ db5bc9ac
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",
......@@ -137,6 +136,7 @@ controller('editEquityChangeModalController', ['$scope', '$log', '$translate', '
},
{
dataField: "payableShareholderIdNum",
visible: false,
caption: $translate.instant('PayableShareholderIdNum'),
allowHeaderFiltering: false
},
......@@ -163,30 +163,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 +256,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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment