Skip to content

T
traffic-front
Commit 0c231b42 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed org -- frank

parent f30165c9
Hide whitespace changes
Inline Side-by-side
Showing with 742 additions and 59 deletions
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js
View file @ 0c231b42
...@@ -323,19 +323,6 @@ ...@@ -323,19 +323,6 @@
dataField: "taxPayerNumber", dataField: "taxPayerNumber",
allowHeaderFiltering: true, allowHeaderFiltering: true,
caption: $translate.instant('TaxPayerNumber') caption: $translate.instant('TaxPayerNumber')
//headerFilter: {
// dataSource: {
// load: function () {
// return [{
// text: hasTaxpayNumer,
// value: [['taxPayerNumber', '<>', null],'and', ['taxPayerNumber', '<>', '']]
// }, {
// text: noTaxpayNumer,
// value: [['taxPayerNumber', '=', null], 'or', ['taxPayerNumber', '=', '']]
// }];
// }
// }
//},
}, },
{ {
dataField: "structureName", dataField: "structureName",
...@@ -796,18 +783,12 @@ ...@@ -796,18 +783,12 @@
loadPanel: { loadPanel: {
enabled: false enabled: false
}, },
// scrolling: {
// mode: "virtual"
// },
// keyExpr: "id",
// parentIdExpr: "parentID",
selection: { selection: {
mode: "single" mode: "single"
}, },
grouping: { grouping: {
autoExpandAll: false autoExpandAll: false
}, },
// autoExpandAll:true,
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true, columnAutoWidth: true,
showRowLines: true, showRowLines: true,
...@@ -830,11 +811,6 @@ ...@@ -830,11 +811,6 @@
selectAllText: $translate.instant('SelectAll') selectAllText: $translate.instant('SelectAll')
} }
} }
//columnHidingEnabled: true, //自定义显示列
//columnChooser: {
// enabled: true,
// mode: "select"
//},
}; };
$scope.getDetailGridSettings = function (key) { $scope.getDetailGridSettings = function (key) {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 0c231b42
infrastructureModule infrastructureModule
.controller('OrganizationManageController', ['$scope', '$location', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService', .controller('OrganizationManageController', ['$scope', '$location', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService', 'loginContext',
function ($scope, $location, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) { function ($scope, $location, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService, loginContext) {
'use strict'; 'use strict';
$scope.expanded = false; $scope.expanded = false;
$scope.showOrgs = true;
$scope.startDate = new Date(2019, 0, 1); $scope.startDate = new Date(2019, 0, 1);
$scope.endDate = new Date(2019, 11, 31); $scope.endDate = new Date(2019, 11, 31);
...@@ -510,7 +510,6 @@ ...@@ -510,7 +510,6 @@
}); });
}; };
$scope.getDetailGridSettings = function (key) { $scope.getDetailGridSettings = function (key) {
return { return {
//todo 绑定数据 //todo 绑定数据
...@@ -630,7 +629,6 @@ ...@@ -630,7 +629,6 @@
}; };
}; };
// var getEquityChangeList = function (name) { // var getEquityChangeList = function (name) {
// equityService.getChangeLogByOrgName(name).success(function (data) { // equityService.getChangeLogByOrgName(name).success(function (data) {
// if (data) { // if (data) {
...@@ -1951,27 +1949,51 @@ ...@@ -1951,27 +1949,51 @@
} }
}; };
// 初始化函数 // 初始化函数
var initOrg = function () { var initOrg = function () {
getDimensionList();
loadorgTree(); loadorgTree();
loadEnterpriseAccountSetList(); getDimensionList();
loadEquityDatagrid(); // loadEnterpriseAccountSetList();
loadEquityChangeDatagrid(); // loadEquityDatagrid();
// loadEquityChangeDatagrid();
// getServiceList(); // getServiceList();
// 其他信息中的grid // 其他信息中的grid
loadTaxRuleDatagrid(); // loadTaxRuleDatagrid();
loadInvoiceInfoDatagrid(); // loadInvoiceInfoDatagrid();
loadReturnRateInfoDatagrid(); // loadReturnRateInfoDatagrid();
loadAccountingRateInfoDatagrid(); // loadAccountingRateInfoDatagrid();
loadApprovedLevyDatagrid(); // loadApprovedLevyDatagrid();
loadTaxOfficerDatagrid(); // loadTaxOfficerDatagrid();
loadEmployeeDatagrid(); // loadEmployeeDatagrid();
loadTaxpayerQualificationDatagrid(); // loadTaxpayerQualificationDatagrid();
};
var getOrgList = function () {
orgService.getOrgInfoList().success(function (data) {
if (data) {
//data.forEach(function (row) {
// if (row.userList) {
// row.userListStr = _.map(row.userList, function (x) { return x.userName; }).join(constant.comma);
// }
//});
// console.log("dat:" + JSON.stringify(data));
if (loginContext.userName && loginContext.userName.toLowerCase() === "simon") {
data = _.filter(data, function (row) {
return row && row.industryID === "10";
});
}
initPagingControl(data.length);
$scope.DataGridSource = data;
$scope.orgUserGridInstance.repaint();
$scope.orgUserGridInstance.refresh();
// console.log($scope.DataGridSource);
// console.log($scope.orgUserGridOptions);
$scope.oldData = angular.copy(data);
// $scope.setGridHeight();
}
});
}; };
// 保存启用、启用的操作结果 // 保存启用、启用的操作结果
$scope.updateIsActive = function () { $scope.updateIsActive = function () {
$scope.isCanOrganizationIsActiveBtn = false; $scope.isCanOrganizationIsActiveBtn = false;
...@@ -2443,8 +2465,8 @@ ...@@ -2443,8 +2465,8 @@
$scope.selectCompany.orgAttributeRowList = orgAttributeRowList; $scope.selectCompany.orgAttributeRowList = orgAttributeRowList;
$scope.isInternational = $scope.selectCompany.oversea; $scope.isInternational = $scope.selectCompany.oversea;
$scope.editOrgExtraModel.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber; // $scope.editOrgExtraModel.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber;
$scope.selectCompanyExtra.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber; // $scope.selectCompanyExtra.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber;
//加载用户权限list //加载用户权限list
loadUserRoleList(org.id); loadUserRoleList(org.id);
generalSelectCompanyText(); generalSelectCompanyText();
...@@ -2465,14 +2487,14 @@ ...@@ -2465,14 +2487,14 @@
// getEquityListByOrgId(org.id); // getEquityListByOrgId(org.id);
// todo 其他信息的grid可以移到label ng-click事件里做，lazyinit // todo 其他信息的grid可以移到label ng-click事件里做，lazyinit
getTaxRuleList(org.id); // getTaxRuleList(org.id);
getInvoiceInfoList(org.id); // getInvoiceInfoList(org.id);
getReturnRateInfoList(org.id); // getReturnRateInfoList(org.id);
getAccountingRateInfoList(org.id); // getAccountingRateInfoList(org.id);
getApprovedLevyList(org.id); // getApprovedLevyList(org.id);
getTaxOfficerList(org.id); // getTaxOfficerList(org.id);
getEmployeeList(org.id); // getEmployeeList(org.id);
getTaxpayerQualificationList(org.id); // getTaxpayerQualificationList(org.id);
// equityService.getChangeLogByOrgName(org.name).success(function (data) { // equityService.getChangeLogByOrgName(org.name).success(function (data) {
// if (data) { // if (data) {
...@@ -2843,9 +2865,9 @@ ...@@ -2843,9 +2865,9 @@
headerCellClass: 'center', headerCellClass: 'center',
enableFiltering: false, enableFiltering: false,
cellTemplate: '<div class="project-manage-grid-operation ui-grid-cell-contents">' + cellTemplate: '<div class="project-manage-grid-operation ui-grid-cell-contents">' +
'<span ng-click="grid.appScope.updateUserRole(row.entity)" class="operate-span" role="button" tabindex="0" aria-hidden="false" style=""><i class="material-icons middle black-color">create</i></span>' + '<span ng-click="grid.appScope.updateUserRole(row.entity)" class="operate-span" role="button" tabindex="0" aria-hidden="false" style=""><i class="material-icons middle black-color">create</i></span>' +
'<span ng-click="grid.appScope.deleteUserRole(row.entity)" class="operate-span" role="button" tabindex="0" aria-hidden="false" style=""><i class="material-icons button-icons icon-delete">delete</i></span>' + '<span ng-click="grid.appScope.deleteUserRole(row.entity)" class="operate-span" role="button" tabindex="0" aria-hidden="false" style=""><i class="material-icons button-icons icon-delete">delete</i></span>' +
'</div>' '</div>'
}; };
$scope.UIGridColumns.push(colum); $scope.UIGridColumns.push(colum);
...@@ -3040,7 +3062,6 @@ ...@@ -3040,7 +3062,6 @@
return deferred.promise; return deferred.promise;
}; };
//删除用户角色 //删除用户角色
$scope.deleteUserRole = function (userModel) { $scope.deleteUserRole = function (userModel) {
...@@ -3176,6 +3197,9 @@ ...@@ -3176,6 +3197,9 @@
initUserRoleUIGrid(); initUserRoleUIGrid();
loadPermissionTree(); loadPermissionTree();
initOrg(); initOrg();
$timeout(function () {
getOrgList();
}, 200);
getAllRolePermission(); getAllRolePermission();
} }
...@@ -3210,6 +3234,588 @@ ...@@ -3210,6 +3234,588 @@
$scope.architectureTypeList = constant.ArchitectureTypeList; $scope.architectureTypeList = constant.ArchitectureTypeList;
}; };
var loadDatagrid = function () {
$scope.orgUserGridOptionsA = {
bindingOptions: {
dataSource: 'DataGridSource'
},
showBorders: true,
paging: {
pageSize: constant.page.logPageSize
},
pager: {
showPageSizeSelector: true,
allowedPageSizes: constant.page.pageSizeArrary,
showInfo: true
},
// export: {
// enabled: false,
// fileName: "机构信息列表"
// },
// columnChooser: {
// enabled: true
// },
keyExpr: "name",
columns: [
{
dataField: "name",
caption: $translate.instant('OrganizationName'),
allowHeaderFiltering: false,
cellTemplate: function (container, options) {
try {
$('<a class="hyper-link">' + options.value + '</a>')
.attr('href', 'javascript:void(0)')
.on('click', function () {
gotoOrg(options.row.data);
})
.appendTo(container);
} catch (e) {
$log.error(e);
}
}
},
{
dataField: "code",
allowHeaderFiltering: false,
caption: $translate.instant('OrganizationCode')
},
{
dataField: "taxPayerNumber",
allowHeaderFiltering: true,
caption: $translate.instant('TaxPayerNumber')
},
{
dataField: "structureName",
caption: $translate.instant('OrganizationStructureDesc')
},
{
dataField: "regionName",
caption: $translate.instant('AreaRegionTitle'),
allowHeaderFiltering: false
},
{
dataField: "businessUnitName",
caption: $translate.instant('BusinessUnitTitleName'),
allowHeaderFiltering: false
},
{
dataField: "areaName",
caption: $translate.instant('AreaTitleName'),
allowHeaderFiltering: false
},
{
dataField: "industryName",
caption: $translate.instant('PIndustry'),
allowHeaderFiltering: false
},
{
dataField: "isActive",
caption: $translate.instant('EnableStatus'),
allowHeaderFiltering: false,
cellTemplate: function (container, options) {
try {
if (options.data.isActive) {
$('<span>').text(translate.Enabled).appendTo(container);
} else {
$('<span style="color:gray">').text(translate.Disabled).appendTo(container);
}
} catch (e) {
$log.error(e);
}
}
},
{
dataField: "englishName",
caption: $translate.instant('OrganizationNameEn'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "abbreviation",
caption: $translate.instant('Abbreviation'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "foundationDate",
caption: $translate.instant('FoundationDate'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationLocation",
caption: $translate.instant('RegistrationLocation'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationLocationEn",
caption: $translate.instant('RegistrationLocationEn'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonName",
caption: $translate.instant('LegalPersonName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "businessScope",
caption: $translate.instant('BusinessScope'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regStatus",
caption: $translate.instant('RegStatus'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "architectureType",
caption: $translate.instant('ArchitectureType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "nationalEconomicIndustry",
caption: $translate.instant('NationalEconomicIndustry'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "engageNationalProhibitIndustry",
caption: $translate.instant('EngageNationalProhibitIndustry'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationCapital",
caption: $translate.instant('RegistrationCapital'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "paidInCapital",
caption: $translate.instant('PaidInCapital'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "numOfBranches",
caption: $translate.instant('NumOfBranches'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "unifiedSocialCreditCode",
caption: $translate.instant('UnifiedSocialCreditCode'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialAccountingType",
caption: $translate.instant('RegFinancialAccountingType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxRegStatus",
caption: $translate.instant('TaxRegStatus'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxCreditRating",
caption: $translate.instant('TaxCreditRating'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "applicableAccountingRule",
caption: $translate.instant('ApplicableAccountingRule'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "lowValueConsumablesAmortizationMethod",
caption: $translate.instant('LowValueConsumablesAmortizationMethod'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "depreciationMethod",
caption: $translate.instant('DepreciationMethod'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "accountingSoftware",
caption: $translate.instant('AccountingSoftware'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "completeRecordTotalInstitutions",
caption: $translate.instant('CompleteRecordTotalInstitutions'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonName",
caption: $translate.instant('TaxClientPersonName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonPhoneNum",
caption: $translate.instant('TaxClientPersonPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonIdNum",
caption: $translate.instant('TaxClientPersonIdNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "ticketHolderName",
caption: $translate.instant('TicketHolderName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "ticketHolderPhoneNum",
caption: $translate.instant('TicketHolderPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxHallAddress",
caption: $translate.instant('NationalTaxHallAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxAdministratorName",
caption: $translate.instant('NationalTaxAdministratorName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxAdministratorPhoneNum",
caption: $translate.instant('NationalTaxAdministratorPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "localTaxHallAddress",
caption: $translate.instant('LocalTaxHallAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "localTaxAdministratorName",
caption: $translate.instant('LocalTaxAdministratorName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "localTaxAdministratorPhoneNum",
caption: $translate.instant('LocalTaxAdministratorPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "etaWebsite",
caption: $translate.instant('EtaWebsite'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "signTripartiteAgreement",
caption: $translate.instant('SignTripartiteAgreement'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "reportingCurrency",
caption: $translate.instant('ReportingCurrency'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "consolidationTime",
caption: $translate.instant('ConsolidationTime'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "fiscalYearDeadline",
caption: $translate.instant('FiscalYearDeadline'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxAgent",
caption: $translate.instant('TaxAgent'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxAgentContact",
caption: $translate.instant('TaxAgentContact'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "otherFacts",
caption: $translate.instant('OtherFacts'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxReturnBusinessType",
caption: $translate.instant('TaxReturnBusinessType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "smallMeagerProfit",
caption: $translate.instant('SmallMeagerProfit'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "listedCompany",
caption: $translate.instant('ListedCompany'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "applicableAccountingStandardsOrAccountingSystems",
caption: $translate.instant('ApplicableAccountingStandardsOrAccountingSystems'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxPayerNumberVat",
caption: $translate.instant('TaxPayerNumberVat'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxPayerNumberCit",
caption: $translate.instant('TaxPayerNumberCit'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonEmailAddress",
caption: $translate.instant('TaxClientPersonEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "bankAccountName",
caption: $translate.instant('BankAccountName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "bankAccountNumber",
caption: $translate.instant('BankAccountNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonPhoneNumber",
caption: $translate.instant('LegalPersonPhoneNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonLandlineNum",
caption: $translate.instant('LegalPersonLandlineNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonEmailAddress",
caption: $translate.instant('LegalPersonEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerName",
caption: $translate.instant('RegFinancialOfficerName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerPhoneNum",
caption: $translate.instant('RegFinancialOfficerPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerLandlineNum",
caption: $translate.instant('RegFinancialOfficerLandlineNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerEmailAddress",
caption: $translate.instant('RegFinancialOfficerEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "actualBusinessAddress",
caption: $translate.instant('ActualBusinessAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "secondaryApprovalAmount",
caption: $translate.instant('SecondaryApprovalAmount'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "businessRegistrationNumber",
caption: $translate.instant('BusinessRegistrationNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "parValue",
caption: $translate.instant('ParValue'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "issuedShares",
caption: $translate.instant('IssuedShares'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "directors",
caption: $translate.instant('Directors'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "logoutTime",
caption: $translate.instant('LogoutTime'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxRuleIntroduction",
caption: $translate.instant('TaxRuleIntroduction'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "auditRequirements",
caption: $translate.instant('AuditRequirements'),
visible: false,
allowHeaderFiltering: false
}
],
// masterDetail: {
// enabled: false,
// template: "detail"
// },
onContentReady: function (e) {
$scope.orgUserGridInstance = e.component;
// $scope.orgTreeList = e;
// $scope.orgTreeListInstance = e.component;
var totalCount = e.component.totalCount();
if (totalCount > 0) {
$scope.totalCount = totalCount;
}
},
loadPanel: {
enabled: false
},
selection: {
mode: "single"
},
grouping: {
autoExpandAll: false
},
allowColumnResizing: true,
columnAutoWidth: true,
showRowLines: true,
allowColumnReordering: true,
showColumnLines: true,
rowAlternationEnabled: true, //单双行颜色
noDataText: $translate.instant('NoDataText'),
selectAllText: $translate.instant('SelectAll'),
searchPanel: {
placeholder: $translate.instant('Search'),
width: 518,
visible: true
},
headerFilter: {
visible: false,
texts: {
cancel: $translate.instant('Cancel'),
ok: $translate.instant('Confirm'),
emptyValue: $translate.instant('Empty'),
selectAllText: $translate.instant('SelectAll')
}
}
};
// $scope.getDetailGridSettings = function (key) {
// return {
// //todo 绑定数据
// dataSource: new DevExpress.data.DataSource({
// load: function (loadOptions) {
// var deferred = $q.defer();
// return equityService.getEquityListResp(key.data.id).success(function (response) {
// deferred.resolve({data: response, totalCount: response.length});
// }).error(function () {
// deferred.reject("Data Loading Error");
// });
// return deferred.promise;
// }
// }),
// columnAutoWidth: true,
// showBorders: true,
// columns: [
// {
// dataField: "payableShareholderName",
// width: "600px",
// caption: $translate.instant('PayableShareholderName')
// },
// {
// dataField: "payableContributionProportion",
// width: "150px",
// caption: $translate.instant('PayableContributionProportion')
// }]
// };
// }
};
var gotoOrg = function (org) {
$scope.showOrgs = false;
console.log(org);
$scope.selectCompany = org;
};
$scope.showAll = function () {
$scope.showOrgs = true;
$scope.selectCompany = {};
};
(function initialize() { (function initialize() {
$log.debug('organizationManageController.ctor()...'); $log.debug('organizationManageController.ctor()...');
//scope model //scope model
...@@ -3217,6 +3823,7 @@ ...@@ -3217,6 +3823,7 @@
initParams(); initParams();
//showUserTab(); //showUserTab();
checkUserPermission(); checkUserPermission();
loadDatagrid();
$timeout(function () { $timeout(function () {
$scope.isLoadComplete = true; $scope.isLoadComplete = true;
}, 500); }, 500);
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.js
View file @ 0c231b42
...@@ -13,6 +13,20 @@ ...@@ -13,6 +13,20 @@
controller: 'OrganizationManageController', controller: 'OrganizationManageController',
link: function (scope, element, attrs, $element) { link: function (scope, element, attrs, $element) {
scope.setGridHeight = function () {
var pageWrapSelector = ".system-manage";
var menuSelector = ".menu-header";
var contentHeader = '.content-container .org-right-container';
var dxGridSelctor = "#orgGridContainer";
var contentHeaderHeight = parseInt($(contentHeader).css('height').replace('px', ''));
var pageHeight = parseInt($(pageWrapSelector).css('height').replace('px', ''));
var menuHeight = parseInt($(menuSelector).css('height').replace('px', ''));
var height = pageHeight - menuHeight - contentHeaderHeight - 40 + 'px';
$(dxGridSelctor).css('max-height', height);
};
//https://github.com/nathancahill/Split.js/ //https://github.com/nathancahill/Split.js/
Split(['#org-left-container', '#org-right-container'], { Split(['#org-left-container', '#org-right-container'], {
//An array of initial sizes of the elements, specified as percentage values. Example: Setting the initial sizes to 25% and 75%. //An array of initial sizes of the elements, specified as percentage values. Example: Setting the initial sizes to 25% and 75%.
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less
View file @ 0c231b42
...@@ -131,6 +131,94 @@ ...@@ -131,6 +131,94 @@
height: 100%; height: 100%;
float: right; float: right;
.org-list {
border-radius: 5px;
padding: 4px;
background-color: white;
height: 100%;
display: flex;
flex-direction: column;
.org-title {
margin: 8px 5px 0px 5px;
padding-bottom: 10px;
border-bottom: 1px solid #CDCDCD;
.company-detail-left {
display: inline-block;
vertical-align: top;
}
.company-detail-right {
display: inline-block;
margin-left: 10px;
vertical-align: middle;
.company-name {
position: relative;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 18px;
color: #0d0d0d;
height: 48px;
padding-top: 8px;
}
}
.right-option {
height: 30px;
display: inline-block;
vertical-align: middle;
float: right;
.right-operate {
margin-left: 20px;
margin-right: 15px;
display: inline-block;
border: 1px solid @color-light-gray-e4;
.display-user {
background-color: white;
padding: 6px 8px;
display: inline-block;
}
.border-left {
border-left: 1px solid @color-light-gray-e4;
}
}
#organizationIsActiveBtn {
background-image: none;
.material-icons {
font-weight: bold;
color: red;
}
}
}
}
.user-grid{
.createEntityBtn{
z-index: 2;
position: absolute;
.btn-up-grid{
height: 36px;
padding: 0 10px;
border-radius: 5px;
outline:none;
}
}
.grid-container{
margin-top: 10px;
}
}
}
.detail-info { .detail-info {
border-radius: 5px; border-radius: 5px;
padding: 4px; padding: 4px;
......
atms-web/src/main/webapp/app/adminModule.js
View file @ 0c231b42
...@@ -367,8 +367,6 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi- ...@@ -367,8 +367,6 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
sticky: true sticky: true
}); });
//用户明细 //用户明细
$stateProvider.state({ $stateProvider.state({
name: 'userDetail', name: 'userDetail',
......
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