Skip to content

T
traffic-front
Commit 39746550 authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_oracle_neo' into 'dev_oracle' 

Dev oracle neo

See merge request root/atms!153
parents 4d60f347 6c96d113
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 63 deletions
atms-web/src/main/webapp/Scripts/module-part1.js
View file @ 39746550
......@@ -228,6 +228,22 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
sticky: true
});
$stateProvider.state({
name: 'listApproval',
url: '/overview/listApproval',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat,appTranslation.appPart]);
}],
template: '<app-approve servicetypeid="2"></app-overview>',
}
},
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'overviewAssetsManage',
url: '/overview/assetsManage',
......
atms-web/src/main/webapp/app/app.config.js deleted 100644 → 0
View file @ 4d60f347
(function () {
'use strict';
angular.module('app.config', [])
// region of current application
.constant('region', 'zh-CN')
//.constant('region', 'en-US')
// version of current application
.constant('version', '1.0.0.0')
// Exceptionless Server URL
.constant('exceptionlessServerURL', '')
.run([
'region', function (region) {
$.when(
$.getJSON("/Scripts/cldr/main/zh/numbers.json"),
$.getJSON("/Scripts/cldr/main/zh/ca-gregorian.json"),
$.getJSON("/Scripts/cldr/supplemental/likelySubtags.json")
).then(function () {
return [].slice.apply(arguments, [0]).map(function (result) {
return result[0];
});
}).then(Globalize.load).then(function () {
Globalize.locale("zh-CN");
// Globalize.locale("en-US");
DevExpress.localization.locale(region);
//DevExpress.localization.locale(navigator.language || navigator.browserLanguage);
});
}
]);
}());
\ No newline at end of file
atms-web/src/main/webapp/app/app.js deleted 100644 → 0
View file @ 4d60f347
This diff is collapsed.
atms-web/src/main/webapp/app/framework/app-approve/app-approve.html 0 → 100644
View file @ 39746550
<div id="app-approve" class="app-overview ">
<div class="app-overview-left">
<div class="group-operate-icon" style="margin-bottom: 5px;">
<span class="operate-icon left-first" title="机构" ng-click="dimensionOrgShow('','orgName')"><i class="fa fa-sitemap fa-2x orgName" aria-hidden="true"></i></span><span class="operate-icon" title="事业部" ng-click="dimensionOrgShow('businessUnitID','businessUnitName')">
<i class="fa fa-bank fa-2x businessUnitName" aria-hidden="true"></i>
</span><span class="operate-icon" title="区域" ng-click="dimensionOrgShow('areaID','areaName')">
<i class="material-icons areaName">place</i>
</span><span class="operate-icon" title="机构层级" ng-click="dimensionOrgShow('structureID','structureName')">
<i class="fa fa-mortar-board fa-2x structureName"></i>
</span><span class="operate-icon" title="行业" ng-click="dimensionOrgShow('industryID','industryName')">
<i class="fa fa-bars fa-2x industryName" aria-hidden="true"></i>
</span>
</div>
<perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20">
<div ui-tree data-drag-enabled="false">
<ul ui-tree-nodes="" ng-model="orgData">
<li ng-repeat="item in orgData track by $index" ui-tree-node ng-include="'tree_view_template'">
</li>
</ul>
</div>
</perfect-scrollbar>
</div>
<div class="app-overview-right">
<div class="row" style="margin:20px; display:none;">
<div class="col-lg-2 col-md-2 col-sm-2">
<span class="textLabelHeader" translate="TotalProjectRecords"></span> <span class="textLabelHeader">{{queryResults.length}}</span> <span translate="NumberOfTaskes"></span>
</div>
<div class="col-lg-8 col-md-8 col-sm-8">
<span translate="CurrentlyInProgress" class=""> </span> <i class="badge progressNumberBadges marginRight10">3</i>
<span translate="AlreadyCompleted" class=""> </span> <i class="badge progressNumberBadges marginRight10">4</i>
<span translate="NotYetStart" class=""> </span> <i class="badge progressNumberBadges marginRight10 ">5</i>
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<div id="app-workflow-action-panel" class="pull-right">
<i class="fa fa-calendar red-color" style="font-size:20px;"></i>
<input type="text" class="datepicker" style="border-width: 0; outline: none; width: 100px; cursor: pointer; z-index: 1000" readonly="readonly" />
<i class="fa fa-caret-down red-color" style="font-size:10px;"></i>
</div>
</div>
</div>
<div style="display:none;">
<span translate="AssignmentsList" class="textLabelHeader"></span>
<hr />
</div>
<div class="new-right-header">
<div class="head-row">
<span class="total-projects">报表审批</span>
</div>
<div class="project-staus">
<span style="padding-right: 10px;" class="result-style">{{projectMsg}}</span>
<span style="padding-right:10px;">提审中</span><span class="num-style">{{ongoingNum}}</span>
<span style="padding-right:10px;padding-left:20px;">通过</span><span class="num-style">{{notBeginNum}}</span>
<span style="padding-right:10px;padding-left:20px;">未通过</span><span class="num-style">{{completedNum}}</span>
<span style="padding-right:10px;padding-left:20px;">作废</span><span class="num-style">{{completedNum}}</span>
</div>
<div class="task-list">
<span class="taskMsg" ng-show="serviceTypeId !=='12'">审批列表</span>
</div>
</div>
<div class="new-right-body">
<div class="right-header">
<div class="col-lg-3 col-md-3" style="padding-left:20px;">
<div class="search-container">
<input id="txtSmartSearch" class="search-input" type="text" value="" placeholder="提审人" ng-model="searchKeyword" ng-change="smartSearch(false)" /><span ng-class="(searchKeyword!==undefined && searchKeyword.length>0)? 'glyphicon glyphicon-remove input-group-addon search-icon':'glyphicon glyphicon-search input-group-addon search-icon'" search ng-click="smartSearch(true)"></span>
</div>
</div>
<div class="overview-picker">
<input type="text" id="overviewDatepicker" class="datepicker vat-subheader" style="width:120px;" readonly="readonly" />
<i class="fa fa-calendar vat-subheader red-color" style="width:20px;"></i>
</div>
<span class="clear"></span>
</div>
</div>
</div>
<!--<div class="app-overview-right">-->
<!--<div class="vat-preview-input-invoice" id="mainPreviewDiv">-->
<!--<div class="top-area-wrapper">-->
<!--<button class="filter-button"-->
<!--atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"-->
<!--popover-container="body" popover-auto-hide="true" data-overwrite="true"-->
<!--use-optimized-placement-algorithm="true"-->
<!--data-placement="bottom"-->
<!--data-templateurl="/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice-search.html">-->
<!--<i class="fa fa-filter" aria-hidden="true"></i>-->
<!--</button>-->
<!--<span translate="IncomeInvoiceTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：-->
<!--<input type="text" class="form-control input-width-middle" style="position: relative; top: -33px; left: 160px;" id="input-invoice-period-picker" />-->
<!--<span ng-click="downloadInputInvoice()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>-->
<!--</div>-->
<!--<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">-->
<!--<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:-->
<!--<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">-->
<!--<span title="{{criteria.fullName}}">-->
<!--{{criteria.name}}-->
<!--</span>-->
<!--<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>-->
<!--</span>-->
<!--<span ng-if="criteriaList.length>6"><br /></span>-->
<!--<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>-->
<!--<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">-->
<!--<span title="{{criteria.fullName}}">-->
<!--{{criteria.name}}-->
<!--</span>-->
<!--<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>-->
<!--</span>-->
<!--</div>-->
<!--<div id="mainAreaDiv" class="main-area">-->
<!--<div class="inputInvoiceGrid" ui-grid-expandable ui-grid="gridOptions">-->
<!--<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>-->
<!--</div>-->
<!--<div class="pagination-container">-->
<!--<span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.totalCount}}条记录</span>-->
<!--<div id="totalInvoicePage" class="common-pagination" style="display:none;">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-approve/app-approve.js 0 → 100644
View file @ 39746550
frameworkModule.directive('appApprove', ['$log', 'region', 'enums',
function ($log, region, enums) {
'use strict';
$log.debug('appOverview.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/framework/app-approve/app-approve.html' + '?_=' + Math.random(),
replace: true,
scope: {
servicetypeid : '='
},
controller: 'appApproveController',
link: function ($scope, $element, $attr) {
var ele = $(".datepicker");
ele.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
language: region,
viewMode: 1,
minViewMode: 1,
autoclose: true,//选中之后自动隐藏日期选择框
clearBtn: false,//清除按钮
todayBtn: false,//今日按钮
format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate', function (e) {
$scope.changeDate(e);
});
ele.datepicker("setDate", $scope.selectedDate);
$scope.elePicker = ele;
}
};
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ 39746550
......@@ -20,6 +20,11 @@
<span class="nav-icon-color">{{'MenuVAT' | translate}}</span>
</a>
</div>
<div class="nav-element-left">
<a ui-sref="listApproval">
<span class="nav-icon-color">{{'报表审批' | translate}}</span>
</a>
</div>
<!--<div class="nav-element-left">-->
<!--<a ui-sref="summaryDashboard" hover-show="second">-->
<!--<span class="nav-icon-color">{{'MenuTaxAnalysisPlatform' | translate}}</span>-->
......
atms-web/src/main/webapp/app/module-part1.js deleted 100644 → 0
View file @ 4d60f347
This diff is collapsed.
atms-web/src/main/webapp/app/module-part2.js deleted 100644 → 0
View file @ 4d60f347
This diff is collapsed.
atms-web/src/main/webapp/app/module-part3.js deleted 100644 → 0
View file @ 4d60f347
This diff is collapsed.
atms-web/src/main/webapp/app/module-part4.js deleted 100644 → 0
View file @ 4d60f347

var noPermissionPageModule = angular.module('app.noPermissionPage', [])
.run(['$log', function ($log) {
$log.debug('app.noPermissionPage.run()...');
}])
.config(['$controllerProvider', '$compileProvider', '$filterProvider', '$provide', 'scriptDependencyProvider', '$stateProvider', '$urlRouterProvider',
function ($controllerProvider, $compileProvider, $filterProvider, $provide, scriptDependencyProvider, $stateProvider, $urlRouterProvider) {
'use strict';
// this is required to add controller/directive/filter/service after angular bootstrap
bindModule(noPermissionPageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
$stateProvider.state({
name: 'noPermissionPage',
url: '/noPermissionPage',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.noPermissionPage]);
}],
template: '<no-permission-page></no-permission-page>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.noPermissionPage),
deepStateRedirect: true,
sticky: true
});
}]);
\ No newline at end of file
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