Skip to content

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

add UI page -- frank

parent ecba8143
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 323 deletions
atms-web/src/main/webapp/Scripts/module-part4.js
View file @ fa8f0004
...@@ -58,5 +58,22 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi- ...@@ -58,5 +58,22 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'organizationFullChart',
url: '/organizationFullChart',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.infrastructure]);
}],
template: '<organization-full-chart></organization-full-chart>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.infrastructure),
deepStateRedirect: true,
sticky: true
});
$stickyStateProvider.enableDebug(true); $stickyStateProvider.enableDebug(true);
}]); }]);
\ No newline at end of file
atms-web/src/main/webapp/app-resources/css/nav.css
View file @ fa8f0004
...@@ -42,6 +42,17 @@ ...@@ -42,6 +42,17 @@
/*padding-right: 35px;*/ /*padding-right: 35px;*/
} }
.sub-button {
font-size: 15px;
position: relative;
float: left;
height: 55px;
line-height: 55px;
width: 300px;
text-align: center;
/*top: -19px;*/
}
.nav-element-left { .nav-element-left {
font-size: 15px; font-size: 15px;
position: relative; position: relative;
...@@ -115,7 +126,7 @@ ...@@ -115,7 +126,7 @@
} }
.nav-sub-container.second { .nav-sub-container.second {
padding-left: 550px; padding-left: 350px;
} }
.nav-sub-container.first:after { .nav-sub-container.first:after {
...@@ -132,7 +143,7 @@ ...@@ -132,7 +143,7 @@
float: left; float: left;
height: 55px; height: 55px;
line-height: 55px; line-height: 55px;
width: 140px; width: 140px;
text-align: center; text-align: center;
} }
...@@ -163,7 +174,7 @@ ...@@ -163,7 +174,7 @@
} }
.nav-sub-container .element-left a.active { .nav-sub-container .element-left a.active {
color: #e0301e; color: #e0301e;
} }
.nav-icon-color { .nav-icon-color {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.ctrl.js 0 → 100644
View file @ fa8f0004
infrastructureModule.controller('organizationFullChartController', ['$scope', function ($scope) {
'use strict';
(function initialize() {
$log.debug('organizationFullChartController.ctor()...');
})();
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.html 0 → 100644
View file @ fa8f0004
<div class="organization-full-chart-mapper">
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.js 0 → 100644
View file @ fa8f0004
infrastructureModule.directive('organizationFullChart', ['$log', function ($log) {
'use strict';
$log.debug('organizationFullChart.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/admin/infrastructure/organizationFullChart/organization-full-chart.html' + '?_=' + Math.random(),
replace: true,
scope: {},
controller: 'organizationFullChartController',
link: function (scope, element, attrs, $element) {
}
}
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ fa8f0004
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
$scope.expanded = false; $scope.expanded = false;
$scope.showOrgs = true; $scope.showOrgs = true;
$scope.ShowSingle = false; $scope.showSingle = false;
$scope.selectNodeCount=0;
$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);
...@@ -2430,6 +2431,11 @@ ...@@ -2430,6 +2431,11 @@
// 选中事件 // 选中事件
// $scope.selectCompany = org; // $scope.selectCompany = org;
orgService.getSingleOrg(org.id).success(function (data) { orgService.getSingleOrg(org.id).success(function (data) {
if($scope.selectNodeCount>1) {
$scope.showOrgs = false;
$scope.showSingle = true;
}
$scope.selectNodeCount++;
$scope.selectCompany = data; $scope.selectCompany = data;
$scope.selectCompany.isActiveStr = $translate.instant(isActiveMap[$scope.selectCompany.isActive]); $scope.selectCompany.isActiveStr = $translate.instant(isActiveMap[$scope.selectCompany.isActive]);
//$log.debug("org.regionID: " + org.regionID); //$log.debug("org.regionID: " + org.regionID);
...@@ -3811,15 +3817,19 @@ ...@@ -3811,15 +3817,19 @@
$scope.showOrgs = false; $scope.showOrgs = false;
console.log(org); console.log(org);
$scope.selectCompany = org; $scope.selectCompany = org;
$scope.ShowSingle = true; $scope.showSingle = true;
}; };
$scope.showAll = function () { $scope.showAll = function () {
$scope.showOrgs = true; $scope.showOrgs = true;
$scope.ShowSingle = false; $scope.showSingle = false;
$scope.selectCompany = {}; $scope.selectCompany = {};
}; };
$scope.uploadAttach=function () {
};
(function initialize() { (function initialize() {
$log.debug('organizationManageController.ctor()...'); $log.debug('organizationManageController.ctor()...');
//scope model //scope model
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ fa8f0004
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<div class="user-grid" style="margin-top: 10px;"> <div class="user-grid" style="margin-top: 10px;">
<div class="createEntityBtn"> <div class="createEntityBtn">
<button type="button" class="btn btn-up-grid" ng-click="addOrg()" ng-if="hasAddPermission"><i <button type="button" class="btn btn-up-grid" ng-click="addOrg()" ng-if="hasAddPermission"><i
class="material-icons button-icons"> add_circle_outline</i> 新增机构 class="material-icons button-icons"> add_circle_outline</i> 新增机构
</button> </button>
</div> </div>
<div class="dx-viewport grid-container"> <div class="dx-viewport grid-container">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="detail-info" ng-if="ShowSingle"> <div class="detail-info" ng-if="showSingle">
<div class="company-detail"> <div class="company-detail">
<div class="org-title"> <div class="org-title">
<div class="company-detail-left"> <div class="company-detail-left">
...@@ -107,6 +107,9 @@ ...@@ -107,6 +107,9 @@
<md-nav-item md-nav-click="goto('page3')" name="page3"> <md-nav-item md-nav-click="goto('page3')" name="page3">
{{'ComplianceInfo' | translate}} {{'ComplianceInfo' | translate}}
</md-nav-item> </md-nav-item>
<md-nav-item md-nav-click="goto('page4')" name="page4">
{{'ChartInfo' | translate}}
</md-nav-item>
</md-nav-bar> </md-nav-bar>
<div class="ext-content"> <div class="ext-content">
<div ng-show="currentNavItem==='page1'" class="org-basic-data-table"> <div ng-show="currentNavItem==='page1'" class="org-basic-data-table">
...@@ -118,368 +121,267 @@ ...@@ -118,368 +121,267 @@
</button> </button>
</div> </div>
<div class="basic-org-info bottom-row"> <div class="basic-org-info bottom-row">
<div style="width: 100%">
<span style="font-weight: bold;font-size: large;">{{'entityInfo'|translate}}</span>
</div>
<div class="quarter-div leftUp"> <div class="quarter-div leftUp">
<!--机构名称--> <div class="form-group">
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label">{{'OrganizationName' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'companyName'|translate}}:</span>
title="{{selectCompany.name}}">{{selectCompany.name}}</span></span> </div>
<div class="col-sm-6"><span title="{{selectCompany.name}}">{{selectCompany.name}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="">{{'OrganizationNameEn' | translate}}：{{selectCompany.englishName?selectCompany.englishName:'无'}}</span> <div class="col-sm-6"><span
class="control-label">{{'internalEntityCode'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.internalEntityCode}}">{{selectCompany.internalEntityCode}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group">
<div class="col-sm-12" ng-show="!isInternational"> <div class="col-sm-12">
<span class="">{{'OrganizationClientCode' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'legalForm'|translate}}:</span>
title="{{selectCompany.clientCode}}">{{selectCompany.clientCode ? (selectCompany.clientCode):''}}</span></span> </div>
<div class="col-sm-6"><span title="{{selectCompany.legalForm}}">{{selectCompany.legalForm}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span
{{'ArchitectureType' | translate}}：<span class="control-label">{{'registeredAddress'|translate}}:</span></div>
title="{{selectCompany.architectureType}}">{{selectCompany.architectureType?selectCompany.architectureType:'无'}}</span></span> <div class="col-sm-6"><span title="{{selectCompany.registeredAddress}}">{{selectCompany.registeredAddress}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span
{{'RegistrationAddress' | translate}}：<span class="control-label">{{'authorisedCapital'|translate}}:</span></div>
title="{{selectCompany.registerAddress}}">{{selectCompany.registerAddress?selectCompany.registerAddress:'无' }}</span></span> <div class="col-sm-6"><span title="{{selectCompany.authorisedCapital}}">{{selectCompany.authorisedCapital}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span class="control-label">{{'issuedCapital'|translate}}:</span>
{{'RegistrationCapital' | translate}}：<span </div>
title="{{selectCompany.registrationCapital}}">{{selectCompany.registrationCapital?selectCompany.registrationCapital:'无' }}</span></span> <div class="col-sm-6"><span title="{{selectCompany.issuedCapital}}">{{selectCompany.issuedCapital}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span class="control-label">{{'industry'|translate}}:</span></div>
{{'NationalEconomicIndustry' | translate}}：<span <div class="col-sm-6"><span title="{{selectCompany.industry}}">{{selectCompany.industry}}</span>
title="{{selectCompany.nationalEconomicIndustry}}">{{selectCompany.nationalEconomicIndustryStr?selectCompany.nationalEconomicIndustryStr:'无' }}</span></span> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="">{{'LegalPersonName' | translate}}：{{selectCompany.legalPersonName?selectCompany.legalPersonName:'无'}}</span> <div class="col-sm-6"><span class="control-label">{{'paymentofAnnualGovernmentFee'|translate}}:</span>
</div>
<div class="col-sm-6"><span title="{{selectCompany.paymentofAnnualGovernmentFee}}">{{selectCompany.paymentofAnnualGovernmentFee}}</span>
</div>
</div> </div>
</div> </div>
<!-- 分公司数量 --> <div class="form-group">
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'NumOfBranches' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'annualReturnFillingsWithLocalCompaniesRegistry'|translate}}:</span>
title="{{selectCompany.numOfBranches}}">{{selectCompany.numOfBranches?selectCompany.numOfBranches:'无' }}</span></span> </div>
<div class="col-sm-6"><span
title="{{selectCompany.annualReturnFillingsWithLocalCompaniesRegistry}}">{{selectCompany.annualReturnFillingsWithLocalCompaniesRegistry}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'BusinessScope' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'BoardMeetingRequirement'|translate}}:</span>
title="{{selectCompany.businessScope}}">{{selectCompany.businessScope?selectCompany.businessScope:'无' }}</span></span> </div>
<div class="col-sm-6"><span title="{{selectCompany.ReN}}">{{selectCompany.BoardMeetingRequirement}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="quarter-div rightup">
<div class="quarter-div leftRight"> <div class="form-group">
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12"> <div class="col-sm-12">
<span <div class="col-sm-6"><span
class="control-label">{{'UnifiedSocialCreditCode' | translate}}：<span class="control-label">{{'businessLicense'|translate}}:</span></div>
title="{{selectCompany.taxPayerNumber}}">{{selectCompany.taxPayerNumber}}</span></span> <div class="col-sm-6"><span title="{{selectCompany.name}}">{{selectCompany.name}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group">
<div class="col-sm-12" ng-show="!isInternational"> <div class="col-sm-12">
<span class="">{{'Abbreviation' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'RenewalOfBusinessLicenseFeePayment'|translate}}:</span>
title="{{selectCompany.abbreviation}}">{{selectCompany.abbreviation ? (selectCompany.abbreviation):''}}</span></span> </div>
<div class="col-sm-6"><span
title="{{selectCompany.RenewalOfBusinessLicenseFeePayment}}">{{selectCompany.RenewalOfBusinessLicenseFeePayment}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'RegStatus' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'entityLevel'|translate}}:</span>
title="{{selectCompany.regStatus}}">{{selectCompany.regStatus?selectCompany.regStatus:'无' }}</span></span> </div>
<div class="col-sm-6"><span title="{{selectCompany.entityLevel}}">{{selectCompany.entityLevel}}</span>
</div>
</div> </div>
</div> </div>
<!-- 公司代码 -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'OrganizationCode' | translate}}：<span <div class="col-sm-6"><span
title="{{selectCompany.code}}">{{selectCompany.code }}</span></span> class="control-label">{{'DateOfIncorporation'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.DateOfIncorporation}}">{{selectCompany.DateOfIncorporation}}</span>
</div>
</div> </div>
</div> </div>
<!-- 注册地英文地址 -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span class="control-label">{{'jurisdictionOfFormation'|translate}}:</span>
{{'RegistrationAddressEn' | translate}}：<span </div>
title="{{selectCompany.registrationLocationEn}}">{{selectCompany.registrationLocationEn?selectCompany.registrationLocationEn:'无' }}</span></span> <div class="col-sm-6"><span title="{{selectCompany.jurisdictionOfFormation}}">{{selectCompany.jurisdictionOfFormation}}</span>
</div>
</div> </div>
</div> </div>
<!-- 实缴资本 -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'PaidInCapital' | translate}}：<span <div class="col-sm-6"><span
title="{{selectCompany.paidInCapital}}">{{selectCompany.paidInCapital?selectCompany.paidInCapital:'无' }}</span></span> class="control-label">{{'financialYearEnd'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.financialYearEnd}}">{{selectCompany.financialYearEnd}}</span>
</div>
</div> </div>
</div> </div>
<!--从事国家限制或禁止行业--> <div class="form-group">
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> <div class="col-sm-6"><span class="control-label">{{'annualAuditRequirements'|translate}}:</span>
{{'EngageNationalProhibitIndustry' | translate}}：<span </div>
title="{{selectCompany.engageNationalProhibitIndustry}}">{{selectCompany.engageNationalProhibitIndustryStr?selectCompany.engageNationalProhibitIndustryStr:'无'}}</span></span> <div class="col-sm-6"><span title="{{selectCompany.annualAuditRequirements}}">{{selectCompany.annualAuditRequirements}}</span>
</div>
</div> </div>
</div> </div>
<!-- 成立日期 -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="">{{'FoundationDate' | translate}}：<span <div class="col-sm-6"><span
title="{{selectCompany.foundationDate}}">{{selectCompany.foundationDate?(selectCompany.foundationDate| dateFormat:'YYYY-MM-DD'):'' }}</span></span> class="control-label">{{'registeredAgent'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.registeredAgent}}">{{selectCompany.registeredAgent}}</span>
</div>
</div> </div>
</div> </div>
<div class="form-group">
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'Country' | translate}}：<span <div class="col-sm-6"><span class="control-label">{{'ownershipForm'|translate}}:</span>
title="{{selectCompany.country}}">{{selectCompany.country}}</span></span> </div>
<div class="col-sm-6"><span title="{{selectCompany.ownershipForm}}">{{selectCompany.ownershipForm}}</span>
</div>
</div> </div>
</div> </div>
</div> <div class="form-group">
<div class="col-sm-12">
<!-- <div class="col-sm-6"><span
<div class="row"> class="control-label">{{'ResidentSecretary'|translate}}:</span></div>
<div class="col-sm-6"> <div class="col-sm-6"><span title="{{selectCompany.residentSecretary}}">{{selectCompany.residentSecretary}}</span>
<span class="control-label"> {{'BusinessScope' | translate}}：<span </div>
title="{{selectCompany.businessScope}}">{{selectCompany.businessScope |limitString:maxValueLength}}</span></span> </div>
</div> </div>
&lt;!&ndash;<div class="col-sm-6" ng-if="firstAttribute">
<span class="control-label" title="{{firstAttribute.dimensionName}}"> {{firstAttribute.dimensionName|limitString:maxTitleLength}}：</span>
<span class="control-label" title="{{firstAttribute.dimensionValue}}">{{firstAttribute.dimensionValue|limitString:maxValueLength}}</span>
</div>&ndash;&gt;
</div> </div>
<div class="row" ng-repeat="x in selectCompany.orgAttributeRowList">
<div class="col-sm-6">
<span class="control-label" title="{{x.left.dimensionName}}"> {{x.left.dimensionName|limitString:maxTitleLength}}：</span>
<span class="control-label" title="{{x.left.dimensionValue}}">{{x.left.dimensionValue|limitString:maxValueLength}}</span>
</div>
<div class="col-sm-6">
<span class="control-label" ng-if="x.right"
title="{{x.right.dimensionName}}">{{x.right.dimensionName|limitString:maxTitleLength}}：</span>
<span class="control-label" ng-if="x.right"
title="{{x.right.dimensionValue}}">{{x.right.dimensionValue|limitString:maxValueLength}}</span>
</div>
</div>-->
</div> </div>
<hr style="margin-top: 0px;"/>
<!--<div class="row picture-panel">--> <!--attachment-->
<!--&lt;!&ndash; 上级公司 &ndash;&gt;--> <div class="attachment-container">
<!--&lt;!&ndash; <div class="form-group" ng-show="!isInternational">--> <div class="attachment-header">
<!--<div class="col-sm-12">--> <span style="font-size: large;font-weight: bold">Attachment</span>
<!--<span class="">{{'OrganizationParent' | translate}}：<span-->
<!--title="{{selectCompany.parentName}}">{{selectCompany.parentName ? (selectCompany.parentName):''}}</span></span>-->
<!--</div>-->
<!--</div> &ndash;&gt;-->
<!--<div class="col-sm-4 company-property-border" ng-show="!isInternational">-->
<!--<i style="color: #757575;" class="material-icons">sort</i>-->
<!--<span translate="OrganizationParent"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.parentName}}">{{selectCompany.parentName ? (selectCompany.parentName):''}}</span>-->
<!--</p>-->
<!--</div>-->
<!--&lt;!&ndash; 行政地区 &ndash;&gt;-->
<!--&lt;!&ndash; <div class="form-group" ng-show="!isInternational">-->
<!--<div class="col-sm-12">-->
<!--<span class="control-label">-->
<!--{{'AdministrativeRegion' | translate}}：<span-->
<!--title="{{selectCompany.regionName}}">{{selectCompany.regionName }}</span></span>-->
<!--</div>-->
<!--</div> &ndash;&gt;-->
<!--<div class="col-sm-4 company-property-border" ng-show="!isInternational">-->
<!--<i style="color: #757575;" class="material-icons">sort</i>-->
<!--<span translate="AdministrativeRegion"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.regionName}}">{{selectCompany.regionName |limitString:maxValueLength}}</span>-->
<!--</p>-->
<!--</div>-->
<!--<div class="col-sm-4 company-property-border">-->
<!--<i style="color: #757575;" class="material-icons">sort</i>-->
<!--<span translate="Business"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.businessUnitName}}">{{selectCompany.businessUnitName |limitString:maxValueLength}}</span>-->
<!--</p>-->
<!--</div>-->
<!--&lt;!&ndash; 层级 &ndash;&gt;-->
<!--&lt;!&ndash; <div class="form-group" ng-show="!isInternational">-->
<!--<div class="col-sm-12">-->
<!--<span class="">{{'OrganizationLevelType' | translate}}：<span-->
<!--title="{{selectCompany.structureName}}">{{selectCompany.structureName }}</span></span>-->
<!--</div>-->
<!--</div> &ndash;&gt;-->
<!--<div class="col-sm-4 company-property-border">-->
<!--<i style="color: #757575;" class="material-icons">sort</i>-->
<!--<span translate="OrganizationLevelType"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.structureName}}">{{selectCompany.structureName |limitString:maxValueLength}}</span>-->
<!--</p>-->
<!--</div>-->
<!--<div class="col-sm-4 company-property-border">-->
<!--<i style="color: #757575;" class="material-icons">store mall directory</i>-->
<!--<span translate="PIndustry"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.industryName}}">{{selectCompany.industryName |limitString:maxValueLength}}</span>-->
<!--</p>-->
<!--</div>-->
<!--<div class="col-sm-4 company-property-border">-->
<!--<i style="color: #757575;" class="material-icons">place</i>-->
<!--<span translate="Area"></span>-->
<!--<br/>-->
<!--<p><span-->
<!--title="{{selectCompany.areaName}}">{{selectCompany.areaName |limitString:maxValueLength}}</span>-->
<!--</p>-->
<!--</div>-->
<!--</div>-->
<!--<div class="row padding-top10">
<div class="col-sm-6">
<span class="control-label">{{'DepositBank' | translate}}：<span
title="{{selectCompany.bankAccountName}}">{{selectCompany.bankAccountName | limitString:maxValueLength}}</span></span>
</div> </div>
<div class="col-sm-6"> <div class="attachment-option">
<span class="control-label">{{'BankAccount' | translate}}：<span <button type="button" id="uploadAttachBtn" class="btn" ng-click="uploadAttach()"
title="{{selectCompany.bankAccountNumber}}">{{selectCompany.bankAccountNumber | limitString:maxValueLength}}</span></span> style="float:right;background: transparent;">
</div> <i class="fa fa-upload" aria-hidden="true" style="font-size: large"></i>{{'upload'|translate}}
</div> </button>
<div class="row padding-top10">
<div class="col-sm-6">
<span class="control-label">{{'RegistrationLocation' | translate}}：<span
title="{{selectCompany.registrationLocation}}">{{selectCompany.registrationLocation | limitString:maxValueLength}}</span></span>
</div> </div>
<div class="col-sm-6"> <div class="dx-viewport grid-container">
<span class="control-label">{{'RegistrationLocationEn' | translate}}：<span <div id="attachmentContainer" dx-data-grid="attachmentGridOptions"></div>
title="{{selectCompany.registrationLocationEn}}">{{selectCompany.registrationLocationEn | limitString:maxValueLength}}</span></span>
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'RegistrationType' | translate}}：<span
title="{{selectCompany.registrationType}}">{{selectCompany.registrationType | limitString:maxValueLength}}</span></span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'RegistrationDate' | translate}}：<span
title="{{selectCompany.registrationDate}}">{{selectCompany.registrationDate | limitString:maxValueLength}}</span></span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'RegistrationCapital' | translate}}：<span
title="{{selectCompany.registrationCapital}}">{{selectCompany.registrationCapital | limitString:maxValueLength}}</span></span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'PaidInCapital' | translate}}：<span
title="{{selectCompany.paidInCapital}}">{{selectCompany.paidInCapital | limitString:maxValueLength}}</span></span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'BusinessAllottedTimeFrom' | translate}}：<span
title="{{selectCompany.businessAllottedTimeFrom}}">{{selectCompany.businessAllottedTimeFrom | limitString:maxValueLength}}</span></span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'BusinessAllottedTimeTo' | translate}}：<span
title="{{selectCompany.businessAllottedTimeTo}}">{{selectCompany.businessAllottedTimeTo | limitString:maxValueLength}}</span></span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'BusinessScope' | translate}}：<span
title="{{selectCompany.businessScope}}">{{selectCompany.businessScope | limitString:maxValueLength}}</span></span>
</div>
</div>-->
</div> </div>
</div> </div>
<div ng-show="currentNavItem==='page2'" class="equity-info-table"> <div ng-show="currentNavItem==='page2'" class="equity-info-table">
<!--Equity information-->
<div class="label-current-holding"> <div class="label-current-holding">
<label class="basic-label">{{'CurrentHolding' | translate}}</label> <label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' |
translate}}</label>
</div> </div>
<div class="right-option"> <div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;" <button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="updateEquity()" ng-if="hasEditPermission"><i ng-click="addEquity()" ng-if="hasEditPermission"><i
class="material-icons middle">create</i>{{'Change' | translate}} class="material-icons middle">create</i>{{'Create' | translate}}
</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="alterEquity()" ng-if="hasEditPermission"><i
class="mdui-icon material-icons">&#xe145;</i>{{'Alter' | translate}}
</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="refreshEquityList()" ng-if="hasEditPermission"><i
class="mdui-icon material-icons">&#xe5d5;</i>{{'Refresh' | translate}}
</button> </button>
</div> </div>
<div class="current-holding-info"> <div class="current-holding-info">
<span class="control-label">{{'HoldingInstitution' | translate}}：<strong <span class="control-label">{{'ShareHolder' | translate}}：<strong
class="label label-default" class="label label-default"
title="{{EquitySumInfo.orgTotal}}">{{EquitySumInfo.orgTotal}}</strong> title="{{EquitySumInfo.orgTotal}}">{{EquitySumInfo.orgTotal}}</strong>
个</span> </span>
<span class="control-label">{{'TotalInvestment' | translate}}：<strong
class="label label-default"
title="{{EquitySumInfo.amountTotal}}">{{EquitySumInfo.amountTotal}}</strong>
万元</span>
<span class="control-label">{{'TotalEquityRatio' | translate}}：<strong
class="label label-default"
title="{{EquitySumInfo.proportionTotal}}">{{EquitySumInfo.proportionTotal}}</strong>
%</span>
<p ng-show="isNotHundred" class="has-error label"> {{'isNotHundred'|translate}}</p>
</div> </div>
<div class="dx-viewport grid-container"> <div class="dx-viewport grid-container">
<div id="equityGridContainer" dx-data-grid="equityGridOptions" <div id="equityGridContainer" dx-data-grid="equityGridOptions" style="margin-top: 10px;">
style="margin-top: 30px;">
</div> </div>
</div> </div>
<div class="label-equity-change-record"> <!--Direcotr information-->
<label class="basic-label">{{'EquityChangeRecord' | translate}}</label> <div class="label-director">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' |
translate}}</label>
</div>
<div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="addDirector()" ng-if="hasEditPermission"><i
class="material-icons middle">create</i>{{'Create' | translate}}
</button>
</div> </div>
<div class="current-holding-info"> <div class="current-holding-info">
<span class="control-label">{{'ChangeRecord' | translate}}：<strong <span class="control-label">{{'TotalDirector' | translate}}：<strong
class="label label-default" class="label label-default"
title="{{EquityChangeList.length}}">{{EquityChangeList.length}}</strong> title="{{DirectorList.length}}">{{DirectorList.length}}</strong>
条</span> </span>
</div> </div>
<div class="dx-viewport grid-container"> <div class="dx-viewport grid-container">
<div id="equityChangeGridContainer" dx-data-grid="equityChangeGridOptions" <div id="DirectorGridContainer" dx-data-grid="directorGridOptions" style="margin-top: 10px;">
dx-item-alias="equityChangeInfo" style="margin-top: 30px;">
<div data-options="dxTemplate: {name: 'detail'}">
<div dx-data-grid="getDetailGridSettings(equityChangeInfo)"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div ng-show="currentNavItem==='page3'" class="org-compliance-info"> <div ng-show="currentNavItem==='page3'" class="org-compliance-info">
<div class="org-compliance-info-mapper"> <div class="org-compliance-info-mapper">
<div class="org-compliance-info-header"> <div class="org-compliance-info-header">
<span class="compliance-lable">{{'ComplianceCheckList'|translate}}</span>
</div> </div>
<div class="org-compliance-info-body"> <div class="org-compliance-info-body">
<div id="ComplianceGridContainer" dx-data-grid="complianceGridOptions" style="margin-top: 10px;">
</div>
</div>
</div>
</div>
<div ng-show="currentNavItem==='page4'" class="org-chart-info">
<div class="org-chart-info-mapper">
<div class="org-chart-info-top">
<div class="org-chart-container"></div>
</div>
<div class="org-chart-info-bottom col-sm-12">
<div class="org-chart-info-shareholders col-sm-3" style="width: 32%;border: 1px solid #e4e4e4">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Shareholders'|translate}}</span></div>
<div id="orgShareholdersGridContainer" dx-data-grid="orgShareholdersGridOptions" style="margin-top: 10px;"></div>
</div>
<div class="org-chart-info-subsidaries col-sm-3" style="width: 32%;border: 1px solid #e4e4e4;margin-left: 25px">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Subsidaries'|translate}}</span></div>
<div id="orgSubsidariesGridContainer" dx-data-grid="orgSubsidariesGridOptions" style="margin-top: 10px;"></div>
</div>
<div class="org-chart-info-directors col-sm-3" style="width: 32%;border: 1px solid #e4e4e4;margin-left: 25px">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Directors'|translate}}</span></div>
<div id="orgDirectorsGridContainer" dx-data-grid="orgDirectorsGridOptions" style="margin-top: 10px;"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -493,13 +395,13 @@ ...@@ -493,13 +395,13 @@
<edit-organization-modal operate-type="orgOperateType" is-update="isOrgUpdate" <edit-organization-modal operate-type="orgOperateType" is-update="isOrgUpdate"
selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal> selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal>
<!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"--> <!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"-->
<!--selected-organization="selectedOrg"></edit-equity-modal>--> <!--selected-organization="selectedOrg"></edit-equity-modal>-->
<!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"--> <!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"-->
<!--selected-organization="selectedOrg"></edit-equity-change-modal>--> <!--selected-organization="selectedOrg"></edit-equity-change-modal>-->
<!--<add-exist-user-modal operate-type="addUserOperateType" is-update="addUserIsUpdate"--> <!--<add-exist-user-modal operate-type="addUserOperateType" is-update="addUserIsUpdate"-->
<!--selected-user-list="selectedUserList" selected-key-items="selectedKeyItems"></add-exist-user-modal>--> <!--selected-user-list="selectedUserList" selected-key-items="selectedKeyItems"></add-exist-user-modal>-->
<!--<user-organization-access-modal operate-type="userRoleOperateType" is-update="userRolesIsUpdate"--> <!--<user-organization-access-modal operate-type="userRoleOperateType" is-update="userRolesIsUpdate"-->
<!--user-id="selectedUserID" organization-id="selectedOrgID"></user-organization-access-modal>--> <!--user-id="selectedUserID" organization-id="selectedOrgID"></user-organization-access-modal>-->
<!--用户列表--> <!--用户列表-->
<script id="gridRow" type="text/html"> <script id="gridRow" type="text/html">
<tbody> <tbody>
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less
View file @ fa8f0004
...@@ -436,11 +436,11 @@ ...@@ -436,11 +436,11 @@
.quarter-div{ .quarter-div{
width: 50%; width: 50%;
float: left; float: left;
padding: 30px 10px 10px 10px; padding: 30px 10px 10px 0px;
.form-group{ .form-group{
padding-top: 7px; padding-top: 7px;
padding-left: 0; padding-left: 0;
line-height: 2em; line-height: 3em;
margin-left: -15px; margin-left: -15px;
margin-right: -15px; margin-right: -15px;
} }
...@@ -461,6 +461,15 @@ ...@@ -461,6 +461,15 @@
display: block; display: block;
} }
.attachment-container{
.attachment-header{
}
.attachment-option{
height: 40px;
}
}
.picture-panel { .picture-panel {
margin-left: 0px; margin-left: 0px;
margin-right: -200px; margin-right: -200px;
...@@ -748,6 +757,46 @@ ...@@ -748,6 +757,46 @@
} }
.org-compliance-info{
max-height: 100%;
.org-compliance-info-mapper{
.org-compliance-info-header{
margin-top: 10px;
.compliance-lable{
font-weight: bold;
font-size: large;
}
}
}
}
.org-chart-info{
.org-chart-info-mapper{
.org-chart-info-top{
padding-top: 450px;
height: 50%;
}
.org-chart-info-bottom{
height: 50%;
.lable-text{
font-weight: bold;
font-size: large;
}
.org-chart-info-shareholders{
}
.org-chart-info-subsidaries{
}
.org-chart-info-directors{
}
}
}
}
.accountset-modal-table { .accountset-modal-table {
height: 100%; height: 100%;
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.ctrl.js
View file @ fa8f0004
...@@ -101,9 +101,9 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log', ...@@ -101,9 +101,9 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
$('.nav-sub-container').hide(); $('.nav-sub-container').hide();
$('.nav-sub-container.' + className).show(); $('.nav-sub-container.' + className).show();
}, function () { }, function () {
var className = $(this).attr('hover-show');
setTimeout(function () { //等待 nav-sub-container hover 设置上对应的值 setTimeout(function () { //等待 nav-sub-container hover 设置上对应的值
if (enterSubHeader) { if (!enterSubHeader) {
var className = $(this).attr('hover-show');
$('.nav-sub-container.' + className).hide(); $('.nav-sub-container.' + className).hide();
} }
}, 200); }, 200);
...@@ -116,35 +116,6 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log', ...@@ -116,35 +116,6 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
$('.nav-sub-container').hide(); $('.nav-sub-container').hide();
}); });
// 是否显示admin齿轮，校验是否有WebAdmin权限，不是校验is_admin字段
// todo 增值税申报和报表审批菜单没有做权限管理，可以在这里一起加上
var list = [];
list.push(constant.adminPermission.WebAdmin);
list.push(constant.vatPermission.code);
list.push(constant.menuRecordManagePermission.code);
list.push(constant.menuListApprovalPermission.code);
list.push(constant.batchImportPermisson.batchImportPermissonCode);
//税享权限
list.push(constant.InteractionPermission.code);
$scope.$root.checkUserPermissionList(list).success(function (data) {
$scope.adminSettingShow = data[constant.adminPermission.WebAdmin];
$scope.menuCalendarShow = true;
$scope.menuEntityManagementShow = true;
// $scope.vatShow = data[constant.vatPermission.code];
// $scope.menuRecordManageShow = data[constant.menuRecordManagePermission.code];
// $scope.menuListApprovalShow = data[constant.menuListApprovalPermission.code];
// $scope.batchImportShow = data[constant.batchImportPermisson.batchImportPermissonCode];
// //税享权限
// $scope.InteractionShow = data[constant.InteractionPermission.code];
});
}; };
//设置 菜单选中状态 //设置 菜单选中状态
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ fa8f0004
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<span style="font-weight:bold;">Entity Info Database</span> <span style="font-weight:bold;">Entity Info Database</span>
</div> </div>
<div class="nav-element-left" hover-show="first" atms-permission permission-control-type="ngIf" permission-code="{{vatPermission.taxCalendarDisplay.menuControl}}"> <div class="nav-element-left">
<a ui-sref-active="active" ui-sref="taxCalendar"> <a ui-sref-active="active" ui-sref="taxCalendar">
<span id="taxCalendar" class="nav-icon-color">{{'MenuCalendar' | translate}}</span> <span id="taxCalendar" class="nav-icon-color">{{'MenuCalendar' | translate}}</span>
</a> </a>
</div> </div>
<div class="nav-element-left" hover-show="second" ng-if="menuEntityManagementShow"> <div class="nav-element-left">
<a ui-sref="organization"> <a ui-sref="organization" hover-show="second">
<span class="nav-icon-color">{{'MenuEntityManagement' | translate}}</span> <span class="nav-icon-color">{{'MenuEntityManagement' | translate}}</span>
</a> </a>
</div> </div>
...@@ -79,25 +79,13 @@ ...@@ -79,25 +79,13 @@
</div> </div>
<div class="nav-sub-container second"> <div class="nav-sub-container second">
<div class="sub-bar-content">
<div class="element-left"> <div class="sub-button">
<a ui-sref-active="active" ui-sref="organization" ng-if="specialUser!=='simon'"> <a ui-sref-active="active" ui-sref="organizationFullChart">
<span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span> <span class="nav-sub-icon-color">{{'organizationFullChart' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span>
</a> </a>
</div> </div>
<div class="element-left">
<a ui-sref-active="active" ui-sref="ownershipChart" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a>
</div> </div>
</div> </div>
<!--<div class="nav-sub-container second">--> <!--<div class="nav-sub-container second">-->
......
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