Skip to content

T
traffic-front
Commit 22d5f56c authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

areaName and businessUnitName

See merge request root/atms!160
parents 7aaf0076 920fb4d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 151 deletions
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js
View file @ 22d5f56c
...@@ -186,12 +186,12 @@ ...@@ -186,12 +186,12 @@
}, },
{ {
dataField: "businessUnitName", dataField: "businessUnitName",
caption: $scope.businessName, caption: $translate.instant('BusinessUnitTitleName'),
allowHeaderFiltering: false, allowHeaderFiltering: false,
}, },
{ {
dataField: "areaName", dataField: "areaName",
caption: $scope.areaName, caption: $translate.instant('AreaTitleName'),
allowHeaderFiltering: false, allowHeaderFiltering: false,
}, },
{ {
......
atms-web/src/main/webapp/app/vat/analyzeReport/vat-analysis-menu/vat-analysis-menu.ctrl.js
View file @ 22d5f56c
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
$log.debug('VatAnalysisMenuController.ctor()...'); $log.debug('VatAnalysisMenuController.ctor()...');
$scope.menus = [ $scope.menus = [
{ name: '.analyzeReport', text: $translate.instant('ModelAnalysis'), icon: 'glyphicon glyphicon-flag', permission: constant.vatPermission.dataAnalysis.modelAnalysisCode, show: true }, { name: '.analyzeReport', text: "出口数据对比", icon: 'glyphicon glyphicon-flag', permission: constant.vatPermission.dataAnalysis.modelAnalysisCode, show: true },
{ name: 'analyzeOrganizeDashboard({id:"' + vatSessionService.project.organizationID + '"})', text: $translate.instant('Dashboard'), icon: 'glyphicon glyphicon-stats', permission: constant.vatPermission.dataAnalysis.dashboard.dashboardCode, show: true }, { name: 'analyzeOrganizeDashboard({id:"' + vatSessionService.project.organizationID + '"})', text: "进项税额差异分析", icon: 'glyphicon glyphicon-stats', permission: constant.vatPermission.dataAnalysis.dashboard.dashboardCode, show: true },
{ name: '.vatTaxDifference', text: $translate.instant('BookTaxDifference'), icon: 'glyphicon glyphicon-tree-conifer', show: true } { name: '.vatTaxDifference', text: $translate.instant('BookTaxDifference'), icon: 'glyphicon glyphicon-tree-conifer', show: true }
]; ];
vatSessionService.querySummayDashboardModel = { vatSessionService.querySummayDashboardModel = {
......
atms-web/src/main/webapp/app/vat/analyzeReport/vat-model-analysis/vat-model-analysis.html
View file @ 22d5f56c
<div class="vat-model-analysis flex-row-start-stretch"> <div class="vat-model-analysis ">
<div class="ng-template" style="display:none"> <div class="col-lg-12 col-md-12" style="margin-top:20px;">
<script type="text/ng-template" class="content" id="vat-model-analysis-dirty-data-process-bar.html"> <div >
<div class="modal-header"> <table border="1" width="95%" style="margin: auto">
<h4 class="modal-title">模型计算中...</h4> <thead>
</div> <tr class="th">
<div class="modal-body"> <th>遇到一个问题1</th>
<div dx-progress-bar="dirtyDataProcess.progressBarOptions"></div> <th>遇到一个问题1</th>
</div> </tr>
</script> </thead>
</div> <tbody>
<tr class="tb">
<div class="left-container flex-0-0-auto" dx-resizable="resizableOptions"> <td>遇到一个问题</td>
<script type="text/ng-template" id="vat-model-analysis-nodes-renderer.html"> <td>遇到一个问题</td>
<div ui-tree-handle class="tree-node tree-node-content" </tr>
ng-class="{'tree-item-select':(node.categoryId == selectCategoryId)}"> </tbody>
<i class="fa" data-nodrag ng-click="toggle(this)" ng-show="node.nodes.length>0" </table>
ng-class="{'fa-caret-right': collapsed,'fa-caret-down': !collapsed}"></i>
<span ng-click="nodeSelected(node)">
<span class="title" data-nodrag>
{{node.title}}
</span>
<span class="detail-number" data-nodrag>({{node.questionCount}}/{{node.totalCount}})</span>
</span>
</div>
<ol ui-tree-nodes ng-model="node.nodes" ng-hide="collapsed || node.nodes.length < 1">
<li ng-repeat="node in node.nodes" ui-tree-node
ng-include="'vat-model-analysis-nodes-renderer.html'"></li>
</ol>
</script>
<div ui-tree data-drag-enabled="false">
<ol ui-tree-nodes ng-model="modelTreeList" style="z-index:0;">
<li ng-repeat="node in modelTreeList" ui-tree-node ng-include="'vat-model-analysis-nodes-renderer.html'"
data-scroll-container=".model-configuration-manage #tree-root"></li>
</ol>
</div>
</div>
<div class="right-container flex-grow-1 flex-column-start-stretch">
<div class="menu flex-row-start-center flex-shrink-0">
<strong class="flex-0-0-auto">{{'ModelAnalysisResults' | translate}}</strong>
<div class="flex-1-1-auto flex-row-start-center">
<div class="flex-row-start-center">
<span>{{'ModelFeature' | translate}}：</span>
<div class="model-type flex-row-start-center">
<span ng-model="modelType" uib-btn-radio="1">{{'IndexAnalysis' | translate}}</span>
<span ng-model="modelType" uib-btn-radio="2">{{'EntryComparison' | translate}}</span>
</div>
</div>
<div class="filter flex-row-start-center" ng-show="modelType === 2">
<span>{{'Period' | translate}}：</span>
<div class="period-range">
<input type="text" class="form-control"/>
</div>
</div>
</div>
<div class="flex-row-start-center flex-0-0-auto operation-wrapper">
<div class="btn-wrapper">
<button class="btn btn-vat-primary" ng-click="getOutputModelResult()">
{{'OutputModelResult' | translate}}
</button>
</div>
<span ng-click="logOptions.isShown = true"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
</div>
</div> </div>
<model-analysis-report class="flex-1-1-auto"
has-query-permission="hasQueryPermission"
has-filter-issue-permission="hasFilterIssuePermission"
model-type="modelType"
category-id="selectCategoryId"
service-type-id="serviceTypeId"
organization-id="organizationId"
industry-id="industryId"
period-from="periodFrom"
period-to="periodTo"
project-year="projectYear">
</model-analysis-report>
</div> </div>
<style>
<vat-operate-log period="logOptions.period" .th>th{
module-type="logOptions.moduleId" text-align: center;
is-show="logOptions.isShown"> }
</vat-operate-log> .tb>td{
height: 30px;
text-align: center;
}
</style>
</div> </div>
\ No newline at end of file
atms-web/src/main/webapp/app/vat/dashboard/vat-organization-dashboard/vat-organization-dashboard.html
View file @ 22d5f56c
<div class="vat-organization-dashboard"> <div class="vat-organization-dashboard">
<div class="content"> <div class="content">
<!-- 标题 --> <div class="col-lg-12 col-md-12" style="margin-top:10px;">
<div class="header" style="padding-left: 10px; margin-left: -15px">
<span class="title">{{'taxDashboard' | translate}}</span>
<span class="title" style="margin:0px 15px 0px 5px">|</span>
<span class="title" style="margin-left: -10px; ">{{'IndicatorsTotal' | translate}}
<span class="indicators_total">{{querySummaryResult.length}}</span>
</span>
<span><a class="add-chart" ui-sref="{{urlFromAnalyze}}"><i class="material-icons add-icon">add_circle</i>{{'AddChart' | translate}}</a></span>
</div> </div>
<div class="col-lg-24 col-md-24 fit-height">
<!-- 添加图标 --> <table border="1" width="95%" style="margin: auto">
<!--<div class="filter"> <thead>
<a class="add-chart" ui-sref="{{urlFromAnalyze}}"><i class="material-icons add-icon">add_circle</i>{{'AddChart' | translate}}</a> <tr class="th">
</div>--> <th>会计科目</th>
<th>明细字段</th>
<th>金额</th>
<!-- 指标配置数据 --> <th>差异</th>
<!--suppress-scroll-x="true" 隐藏横向滚动条--> <th>差异原因</th>
<perfect-scrollbar class="scroller summary-result" wheel-propagation="true" wheel-speed="3" min-scrollbar-length="20" suppress-scroll-x="true"> </tr>
<div class="row-block" ng-repeat="node in querySummaryResult"> </thead>
<div class="title_abstract"> <tbody >
<div class="col-sm-2 title_name"> <tr ng-repeat="x in list">
<span ng-click="toggleChart($event,node)" style="margin-right:5px" ng-show="node.isShowChart"><i class="fa fa-minus" aria-hidden="true"></i></span> <td>{{}}</td>
<span ng-click="toggleChart($event,node)" style="margin-right:5px" ng-show="!node.isShowChart"><i class="fa fa-plus" aria-hidden="true"></i></span> <td>{{}}</td>
<span>{{node.name}}</span> <td>{{}}</td>
</div> <td>{{}}</td>
<div class="title_button"> <td>{{}}</td>
<a href="javascript:(0);" ng-click="deleteChartConfig(node.id);"><i class="fa fa-trash"></i>{{'deleteChartTitle' | translate}}</a> </tr>
<a ui-sref="{{urlFromAnalyze}}({id:node.id})"><i class="fa fa-cog"></i>{{'IndexConfig' | translate}}</a> </tbody>
<a href="javascript:(0);" ng-click="exportChart(node);"><i class="fa fa-download" aria-hidden="true"></i>{{'ExportBtn' | translate}}</a> </table>
<a href="javascript:(0);"><i class="fa fa-envelope" aria-hidden="true"></i>{{'Email' | translate}}</a>
</div>
</div>
<div class="title_total" ng-show="node.modelTips.length > 0 && node.isShowChart">
<div class="col-sm-1">{{'RiskIssue' | translate}}：</div>
<div class="col-sm-11 risk_tip_wrapper">
<span class="risk_item" ng-repeat="risk in node.modelTips" uib-tooltip="{{risk.description}}" tooltip-placement="bottom" tooltip-class="risk_tip">
<i class="fa fa-exclamation-circle" aria-hidden="true" ng-style="setRiskTipStyle(risk)"></i>{{risk.name}}
</span>
</div>
</div>
<div class="row-content" ng-show="node.isShowChart">
<div class="table-content" id="{{node.id}}" ng-show="node.isShowChart && !node.isEmpty">
</div>
<div class="chart-content" ng-show="node.isShowChart && !node.isEmpty">
<vat-echart-renderer id="chart-{{node.id}}" chart-option="node" is-dynamic-option="false"></vat-echart-renderer>
</div>
<div class="no-chart-content" ng-show="node.isShowChart && node.isEmpty">{{'NoDataInChart' | translate}}</div>
</div>
</div>
</perfect-scrollbar>
<div id="organizationDirtyProcessBarContainer">
<script type="text/ng-template" class="content" id="dirtyDataProcessBar.html">
<div class="modal-header">
<h4 class="modal-title">模型计算中...</h4>
</div>
<div class="modal-body process-bar-container">
<div id="progress">
<div id="progressBarStatus" dx-progress-bar="progressBarOptions"></div>
</div>
</div>
</script>
</div> </div>
</div> </div>
<style>
.th>th{
width : 15%;
text-align: center;
}
</style>
</div> </div>
atms-web/src/main/webapp/app/vat/dashboard/vat-organization-dashboard/vat-organization-dashboard.js
View file @ 22d5f56c
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
restrict: 'E', restrict: 'E',
templateUrl: '/app/vat/dashboard/vat-organization-dashboard/vat-organization-dashboard.html' + '?_=' + Math.random(), templateUrl: '/app/vat/dashboard/vat-organization-dashboard/vat-organization-dashboard.html' + '?_=' + Math.random(),
scope: {}, scope: {},
replace: true,
controller: 'OrganizationDashboardController', controller: 'OrganizationDashboardController',
link: function (scope, element) { link: function ($scope, $element, $attr) {
} }
}; };
......
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