Skip to content

T
traffic-front
Commit 3547477b authored by Mccoy Z Xia's avatar Mccoy Z Xia
Browse files
Options

添加calendar，删除一些不需要的

parent c1e6f59d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 717 additions and 531 deletions
atms-web/src/main/webapp/Gruntfile.js
View file @ 3547477b
......@@ -125,6 +125,7 @@ grunt.initConfig({
"app-resources/css/toolbar.css",
"app-resources/css/table.css",
"app-resources/css/tui-calendar.css",
"app-resources/css/tui-calendar.min.css",
"app-resources/css/tui-date-picker.css",
"app-resources/css/tui-time-picker.css"],
dest: '<%= pkg.bundleDest %>/appresources.css'
......@@ -429,6 +430,20 @@ grunt.initConfig({
'<%= pkg.bundleDest %>/less/vat.less': "app/vat/**/*.less"
}
},
calendarJs: {
src: "app/calendar/**/*.js",
dest: '<%= pkg.bundleTemp %>/calendar.js'
},
calendarCss: {
src: "app/calendar/**/*.css",
dest: '<%= pkg.bundleDest %>/calendar.css'
},
calendarLess: {
options: {process},
files: {
'<%= pkg.bundleDest %>/less/calendar.less': "app/calendar/**/*.less"
}
},
dataImpJs: {
src: "app/dataImport/**/*.js",
dest: '<%= pkg.bundleTemp %>/dataImp.js'
......@@ -523,6 +538,11 @@ grunt.initConfig({
files: {
"<%= pkg.bundleDest %>/vat.less": "<%= pkg.bundleDest %>/less/vat.less"
}
},
calendar: {
files: {
"<%= pkg.bundleDest %>/calendar.less": "<%= pkg.bundleDest %>/less/calendar.less"
}
}
},
//压缩js
......@@ -634,5 +654,9 @@ grunt.registerTask('dev', '开发环境', function () {
'concat:vatJs', 'concat:vatCss','concat:vatLess',
'concat:dataImpJs', 'concat:dataImpCss','concat:dataImpLess',
'concat:analysisJs', 'concat:analysisCss','concat:analysisLess',
'concat:scriptsLogin','less', 'copy', 'clean'])
'concat:scriptsLogin',
'concat:calendarJs','concat:calendarLess','concat:calendarCss',
'concat:appresourcesCss',
'less', 'copy', 'clean'
])
});
atms-web/src/main/webapp/Scripts/app.js
View file @ 3547477b
......@@ -3,9 +3,11 @@
//
var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', 'ui.event', 'pascalprecht.translate', 'ngMessages', 'ui.utils',
'ngRoute', 'ngCookies', 'ngSanitize', 'ct.ui.router.extras', 'chieffancypants.loadingBar', 'ngDraggable', 'ngFileUpload', 'LocalStorageModule', 'exceptionless',
'app.config', 'app.common', 'app.webservices', 'app.framework', 'app.vat', 'app.invoice', 'app.cit', "app.dataImport", 'app.assetsManage', 'app.taxDocumentManage','app.backlogManage',
'app.taxTaskManage', 'pasvaz.bindonce', 'app.vatDashboard', 'app.vatDongfeng', 'vs-repeat', 'ivh.treeview', 'angular-cache', 'app.cache', 'angularBootstrapNavTree',
'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage','app.dataImp','app.analysis','app.infrastructure'])
'app.config', 'app.common', 'app.webservices', 'app.framework',
'pasvaz.bindonce', 'vs-repeat', 'ivh.treeview', 'angular-cache', 'app.cache', 'angularBootstrapNavTree',
'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage', 'app.infrastructure',
'app.taxCalendar'
])
//run blocks are executed after the injector is created and are the first
//methods that are executed in any Angular app.
.run(['$log', '$http', 'CacheFactory', 'userService', 'loginContext', '$rootScope', 'vatSessionService', '$q', function ($log, $http, CacheFactory, userService, loginContext, $rootScope, vatSessionService, $q) {
......@@ -280,7 +282,6 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
taxDocumentList: 'taxDocumentList',
backlogManage: 'backlogManage',
noPermissionPage: 'noPermissionPage',
infrastructure: 'infrastructure',
/// <summary>
/// async load translation tables into application for specified part names that required for the view.
/// </summary>
......@@ -331,6 +332,13 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
// back or forward
$log.debug('Go back or go forward to view browser history. Url: ' + newLocation);
}
if (newLocation == '') {
userService.getUserPermissionNew(loginContext.userName, function (data) {
if (window.PWC.isHavePermission(constant.vatPermission.taxCalendarDisplay.menuControl, data)) {
$location.path('/calendar');
}
});
}
});
$scope.$on('$stateChangeSuccess',
......@@ -361,15 +369,15 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
};
$rootScope.changeLanguage(region);
// waterMark({
// systemId: '2500',
// //当前用户ID
// userId: loginContext.localName,
// textStyle: 'rgba(0,0,0,0.05)',
// imgHeightDis: 230,
// imgWidthDis: 230,
// containerEl: document.querySelector('body')
// });
waterMark({
systemId: '2500',
//当前用户ID
userId: loginContext.localName,
textStyle: 'rgba(0,0,0,0.05)',
imgHeightDis: 230,
imgWidthDis: 230,
containerEl: document.querySelector('body')
});
// publish unbeforeunload event to child scopes
$scope.onbeforeunload = function () {
......
atms-web/src/main/webapp/Scripts/module-part2.js
View file @ 3547477b
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/Scripts/module-part4.js
View file @ 3547477b
......@@ -30,139 +30,6 @@ var noPermissionPageModule = angular.module('app.noPermissionPage', [])
});
}]);
var taxDocumentManageModule = angular.module('app.taxDocumentManage', ['ui.grid', 'ui.grid.selection', 'ui.grid.moveColumns'
, 'ui.grid.grouping', 'ui.grid.expandable', 'ui.grid.treeView', 'ui.grid.exporter', 'ui.grid.resizeColumns'
, 'mc.resizer', 'ui.select', 'ngSanitize', 'ui.grid.edit', 'perfect_scrollbar', 'dx', 'ui.grid.pinning'])
.run(['$log', function ($log) {
$log.debug('app.taxDocumentManage.run()...');
}])
.config(['$controllerProvider', '$urlRouterProvider', '$compileProvider', '$filterProvider', '$provide', '$stateProvider', 'uiSelectConfig', 'scriptDependencyProvider',
function ($controllerProvider, $urlRouterProvider, $compileProvider, $filterProvider, $provide, $stateProvider, uiSelectConfig, scriptDependencyProvider) {
'use strict';
// this is required to add controller/directive/filter/service after angular bootstrap
bindModule(taxDocumentManageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
//uiSelectConfig.theme = 'select2';
//$urlRouterProvider.when('/taxDocumentManage', '/taxDocumentManage/document-manage/documentManage');
//$stateProvider.state({
// name: 'taxDocumentManage',
// url: '/taxDocumentManage',
// cache: false,
// views: {
// '@': {
// controller: ['$scope', '$stateParams', 'appTranslation',
// function ($scope, $stateParams, appTranslation) {
// appTranslation.load([appTranslation.cit]);
// }],
// template: '<document-manage></document-manage>',
// }
// },
// resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.taxDocumentManage), //???
// deepStateRedirect: true,
// sticky: true
//});
}]);
var backlogManageModule = angular.module('app.backlogManage', ['ui.grid', 'ui.grid.selection', 'ui.grid.moveColumns'
, 'ui.grid.grouping', 'ui.grid.expandable', 'ui.grid.treeView', 'ui.grid.exporter', 'ui.grid.resizeColumns'
, 'mc.resizer', 'ui.select', 'ngSanitize', 'ui.grid.edit', 'perfect_scrollbar', 'dx', 'ui.grid.pinning'])
.run(['$log', function ($log) {
$log.debug('app.backlogManageModule.run()...');
}])
.config(['$controllerProvider', '$urlRouterProvider', '$compileProvider', '$filterProvider', '$provide', '$stateProvider', 'uiSelectConfig', 'scriptDependencyProvider',
function ($controllerProvider, $urlRouterProvider, $compileProvider, $filterProvider, $provide, $stateProvider, uiSelectConfig, scriptDependencyProvider) {
'use strict';
// this is required to add controller/directive/filter/service after angular bootstrap
bindModule(backlogManageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
}]);
var taxTaskManageModule = angular.module('app.taxTaskManage', ['ui.grid', 'ui.grid.selection', 'ui.grid.moveColumns'
, 'ui.grid.grouping', 'ui.grid.expandable', 'ui.grid.treeView', 'ui.grid.exporter', 'ui.grid.resizeColumns'
, 'mc.resizer', 'ui.select', 'ngSanitize', 'ui.grid.edit', 'perfect_scrollbar', 'dx', 'ui.grid.pinning'])
.run(['$log', function ($log) {
$log.debug('app.taxTaskManage.run()...');
}])
.config(['$controllerProvider', '$urlRouterProvider', '$compileProvider', '$filterProvider', '$provide', '$stateProvider', 'uiSelectConfig', 'scriptDependencyProvider',
function ($controllerProvider, $urlRouterProvider, $compileProvider, $filterProvider, $provide, $stateProvider, uiSelectConfig, scriptDependencyProvider) {
'use strict';
// this is required to add controller/directive/filter/service after angular bootstrap
bindModule(taxTaskManageModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
$stateProvider.state({
name: 'taxTaskManage',
url: '/taxTaskManage?{code:string}',
cache: false,
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
console.log("taxTaskManageModule $stateParams:" + $stateParams.code);
$scope.code = $stateParams.code;
console.log("taxTaskManageModule $scope.code:" + $scope.code);
appTranslation.load([appTranslation.cit]);
}],
template: '<tax-task-manage code="code"></tax-task-manage>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.taxTaskManage),
deepStateRedirect: false,
sticky: false
});
}]);
var dataImportModule = angular.module('app.dataImport', [])
.run(['$log', function ($log) {
$log.debug('app.dataImport.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(dataImportModule, $controllerProvider, $compileProvider, $filterProvider, $provide);
$stateProvider.state({
name: 'GlobalDataImportLayout',
url: '/globalDataImportLayout',
template: '<div global-data-import-layout></div>',
controller: ['$scope', '$stateParams', 'appTranslation', function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
}],
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImport),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'GlobalDataImportView',
url: '/globalDataImportView',
params: {
"organization": null,
"dataType": null,
"periodYear": null,
"periodMonth": null,
"project": null,
"isBatchImport": null
},
template: '<div global-data-import-view="stateParams"></div>',
controller: ['$scope', '$stateParams', 'appTranslation', function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.appPart]);
$scope.stateParams = $stateParams;
}],
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImport),
deepStateRedirect: true,
sticky: true
});
}]);
var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-select", 'ui.grid', 'ui.grid.selection', 'ui.grid.selection', 'ui.grid.treeView', 'dx', 'perfect_scrollbar', 'ngMaterial', 'app.common'])
.run(['$log', function ($log) {
$log.debug('app.infrastructure.run()...');
......
atms-web/src/main/webapp/app-resources/fonts/calendar/icon.svg 0 → 100644
View file @ 3547477b
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="icomoon" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
<glyph unicode="&#xe900;" glyph-name="ic_location_b" horiz-adv-x="745" d="M372.364-64c-248.242 297.324-372.364 514.536-372.364 651.636 0 205.651 166.713 372.364 372.364 372.364s372.364-166.713 372.364-372.364c0-137.101-124.121-354.313-372.364-651.636zM372.364 401.455c102.825 0 186.182 83.356 186.182 186.182s-83.356 186.182-186.182 186.182c-102.825 0-186.182-83.356-186.182-186.182s83.356-186.182 186.182-186.182z" />
<glyph unicode="&#xe901;" glyph-name="ic_lock_b" horiz-adv-x="819" d="M716.8 550.4c56.554 0 102.4-45.846 102.4-102.4v-409.6c0-56.554-45.846-102.4-102.4-102.4h-614.4c-56.554 0-102.4 45.846-102.4 102.4v409.6c0 56.554 45.846 102.4 102.4 102.4v102.4c0 169.662 137.538 307.2 307.2 307.2s307.2-137.538 307.2-307.2v-102.4zM563.2 550.4v102.4c0 84.831-68.769 153.6-153.6 153.6s-153.6-68.769-153.6-153.6v-102.4h307.2z" />
<glyph unicode="&#xe902;" glyph-name="ic_milestone" horiz-adv-x="922" d="M512 345.6h-307.2v-409.6h-204.8v1024h512c56.554 0 102.4-45.846 102.4-102.4h204.8c56.554 0 102.4-45.846 102.4-102.4v-409.6c0-56.554-45.846-102.4-102.4-102.4h-204.8c-56.554 0-102.4 45.846-102.4 102.4z" />
<glyph unicode="&#xe903;" glyph-name="ic_readonly_b" d="M316.713 147.428c56.18-36.576 123.252-57.828 195.287-57.828 197.939 0 358.4 160.461 358.4 358.4 0 72.035-21.252 139.107-57.828 195.287l-495.859-495.859zM208.828 256.766l494.406 494.406c-55.341 34.981-120.923 55.228-191.234 55.228-197.939 0-358.4-160.461-358.4-358.4 0-70.311 20.247-135.893 55.228-191.234zM512-64c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512z" />
<glyph unicode="&#xe904;" glyph-name="ic_repeat_b" d="M149.961 85.961l-149.961-149.961v409.6h409.6l-151.027-151.027c64.858-64.858 154.458-104.973 253.427-104.973 162.356 0 299.498 107.956 343.558 256h158.2c-47.439-233.701-254.057-409.6-501.758-409.6-141.385 0-269.385 57.308-362.039 149.961zM874.039 810.039l149.961 149.961v-409.6h-409.6l151.027 151.027c-64.858 64.858-154.458 104.973-253.427 104.973-162.356 0-299.498-107.956-343.558-256h-158.2c47.439 233.701 254.057 409.6 501.758 409.6 141.385 0 269.385-57.308 362.039-149.961z" />
<glyph unicode="&#xe905;" glyph-name="ic_state_b" d="M409.6 960h204.8c113.108 0 204.8-91.692 204.8-204.8v-204.8c0-113.108-91.692-204.8-204.8-204.8h-204.8c-113.108 0-204.8 91.692-204.8 204.8v204.8c0 113.108 91.692 204.8 204.8 204.8zM409.6 806.4v-307.2h204.8v307.2h-204.8zM102.4 652.8h819.2c56.554 0 102.4-45.846 102.4-102.4v-512c0-56.554-45.846-102.4-102.4-102.4h-819.2c-56.554 0-102.4 45.846-102.4 102.4v512c0 56.554 45.846 102.4 102.4 102.4z" />
<glyph unicode="&#xe906;" glyph-name="ic_user_b" horiz-adv-x="1138" d="M19.766 49.778c-12.815 5.936-19.766 12.441-19.766 19.521 0 177.732 254.7 321.812 568.889 321.812s568.889-144.080 568.889-321.812c0-7.058-7.462-13.567-21.177-19.521h21.177v-113.778h-1137.778v113.778h19.766zM568.889 960c125.675 0 227.556-101.88 227.556-227.556s-101.88-227.556-227.556-227.556c-125.675 0-227.556 101.88-227.556 227.556s101.88 227.556 227.556 227.556z" />
</font></defs></svg>
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/systemConfiguration.json
View file @ 3547477b
......@@ -251,6 +251,85 @@
"VoucherList": "凭证列表",
"VoucherNotSelectValidator": "请选择凭证筛选配置项",
"VoucherTip": "凭证：科目代码",
"~MustBeEndOneApp": "I Must be the End One, please!"
"TaxCalendarCofigHead":"税务日历设置",
"CalendarNumber":"日历编号",
"Number":"编号",
"Company":"公司",
"CompanyName": "公司名称",
"TaxEvent":"税务事项",
"EventMonth":"事项涉及自然月",
"EventDay":"事项涉及自然日",
"IsRelatedTaxAmount":"是否涉及税金",
"EventAddress":"办事地点",
"EventPerson":"办事人",
"ValidDate":"有效日期",
"CalendarStatus":"状态",
"View":"查看",
"SetTixing":"设置提醒",
"OtherConfig":"其他关联设置",
"CalendarConfigList":"日历配置列表",
"CompanyCalendarList":"公司日历列表",
"January":"1月",
"February":"2月",
"March":"3月",
"April":"4月",
"May":"5月",
"June":"6月",
"August":"7月",
"July":"8月",
"September":"9月",
"October":"10月",
"November":"11月",
"December":"12月",
"Day":"日",
"TheLastDayOfMonth":"月末最后一天",
"ValidDataRequired": "有效日期必选!",
"CompanyRequired": "公司名称必选!",
"EventMonthRequired": "事项涉及自然月必选!",
"TaxOptionRequired": "税务事项必选!",
"EventDayRequired": "事项涉及自然日必选!",
"OperaterRequired": "办事人必选!",
"TaxProjectRequireWrite": "税务事项必填!",
"WorkPlaceRequireWrite": "办事地点必填!",
"NewTaxCalendar": "新建",
"Reset": "重置",
"Query": "查询",
"More": "更多",
"EditTaxProject": "编辑税务事项",
"RelatedTaxAmount": "涉及税款",
"EditWorkPlace": "编辑办事地点",
"Remark": "备注",
"SaveOther": "另存为",
"Save": "保存",
"TaxCalendarSet": "日历设置",
"Qiyong": "启用",
"Jinyong": "禁用",
"Shi": "是",
"Fou": "否",
"TaxProjectName": "税务事项名称",
"NewTaxProject": "新建税务事项",
"WorkPlaceName": "办事地点名称",
"NewWorkPlace": "新建办事地点",
"ToTitle": "至",
"TaxCalendarCount": "涉及日历配置",
"TaxProjectCount": "税务事项数量",
"PleaseSelect": "请选择...",
"PleaseInput": "请输入...",
"TaxProjectMaxLength": "税务事项的最大长度为200个字符!",
"WorkPlaceMaxLength":"办事地点的最大长度为200个字符!",
"TaxProjectNameRepeat": "税务事项的名称与现有名称重复，保存失败!",
"WorkPlaceNameRepeat": "办事地点名称与现有名称重复，保存失败!",
"CommonSuccess": "操作成功!",
"RelatedDayDescription": "说明：",
"RelatedDayInfo1": "1. 对于只有30日的月份，如果选择了31日，日历事项落在30日；",
"RelatedDayInfo2": "2. 对于2月份，如果选择29-31日，闰年则日历事项落在29日，平年则日历事项落在28日；",
"RelatedDayInfo3": "3. 选择“月末最后一天”，则日历事项落在每月的最后一天；",
"ComfirmDeleteData": "确定要删除该条记录吗?",
"RelatedPerson": "相关人员",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.html 0 → 100644
View file @ 3547477b
<div id="tax-calendar-configuration">
<div class="taxCalendarHead">{{'TaxCalendarCofigHead'|translate}}</div>
<div class="searchContainer">
<div style="margin-top: 5px;" class="search-line row">
<div class="search-part-1">
<div class="search-title-lable-2">
{{'Company' | translate}}：
</div>
<div class="search-box-100-2" ng-model="queryEntity.companyIdList" dx-tag-box="companyOptions"></div>
</div>
<div class="search-part-2">
<div class="search-title-lable-4">
{{'TaxEvent' | translate}}：
</div>
<div class="search-box-100-4" ng-model="queryEntity.taxPorjectIdList" dx-tag-box="taxOptions"></div>
</div>
<div class="search-part-3">
<div class="search-title-lable-2">
{{'CalendarStatus' | translate}}：
</div>
<div class="search-box-100-2" ng-model="queryEntity.status" dx-select-box="statusOptions"></div>
<!--<span style="cursor: pointer; padding-right: 10px;" ng-click="taggoleSearchCondition();">{{'More' | translate}}<i ng-class="{true: 'fa fa-angle-down',false: 'fa fa-angle-up'}[isShowMoreSearchCondition]"></i></span>-->
</div>
<div class="search-part-3">
&nbsp;
</div>
</div>
<div style="margin-bottom: 5px;" class="search-line row">
<div class="search-part-1">
<div class="search-title-lable-7">
{{'EventMonth' | translate}}：
</div>
<div class="search-box-50-7" ng-model="queryEntity.eventMonthList" dx-tag-box="eventMonthOptions"></div>
<div class="search-title-lable-7">
{{'EventDay' | translate}}：
</div>
<div class="search-box-50-7" ng-model="queryEntity.eventDayList" dx-tag-box="eventDateOptions"></div>
</div>
<div class="search-part-2">
<div class="search-title-lable-4">
{{'EventAddress' | translate}}：
</div>
<div class="search-box-50-4" ng-model="queryEntity.eventPlaceId" dx-select-box="addressOptions"></div>
<div class="search-title-lable-3">
{{'EventPerson' | translate}}：
</div>
<div class="search-box-50-3" ng-model="queryEntity.operatorIdList" dx-tag-box="operatorOptions"></div>
</div>
<div class="search-part-3">
<div class="search-title-lable-2">
{{'Number' | translate}}：
</div>
<div class="search-box-100-2" ng-model="queryEntity.number" dx-text-box="numberOptions"></div>
</div>
<div class="search-part-3">
<div ng-click="queryList();" class="btn btn-default btn-default-primary">{{'Query' | translate}}</div>
<div ng-click="resetQueryParam();" class="btn btn-default">{{'Reset' | translate}}</div>
</div>
</div>
</div>
<div class="grid-container">
<div class="grid-head-search-container">
<div class="grid-head-search" ng-model="queryEntity.queryType" dx-radio-group="gridSearchRadioOptions"></div>
<div ng-click="goToEditConfig();" atms-permission permission-control-type="ngIf" permission-code="{{$root.adminPermission.systemConfiguration.taxCalendarConfig.editConfig}}" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</div>
</div>
<div id="dx-tax-calendar-data-grid" ng-if="queryEntity.queryType == 1" dx-data-grid="taxDataGridOptions"></div>
<div dx-data-grid="companyCalendarGridOptions" ng-if="queryEntity.queryType == 2" dx-item-alias="companyGroup">
<div data-options="dxTemplate:{name:'companyCalendarTemplate'}">
<div class="internal-grid-container">
<div class="internal-grid" id="company-{{companyGroup.key}}"
dx-data-grid="companyCalendarGridOptions.companyView(companyGroup.data.companyCalendars)">
</div>
</div>
</div>
</div>
</div>
<div class="page-footer" style="padding-right: 10px;float: right;">
<ack-pagination page-options="pagingOptions" refresh-table="queryList();"></ack-pagination>
</div>
</div>
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.js 0 → 100644
View file @ 3547477b
systemConfigurationModule.directive('taxCalendarConfig', ['$log',
function ($log) {
'use strict';
$log.debug('taxCalendarConfig.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.html' + '?_=' + Math.random(),
replace: true,
scope: {},
controller: 'TaxCalendarConfigController',
link: function (scope, element) {
//计算datagrid的高度
scope.setTaxGridHeight = function () {
var pageHeight = $(document).height();
var pageSearchHeight = $('.taxCalendarHead').outerHeight();
var pageFastSearchHeight = $('.searchContainer').outerHeight();
var pageFooterHeight = $('.page-footer').outerHeight();
$('.grid-container').height(pageHeight - pageSearchHeight - pageFastSearchHeight - pageFooterHeight - 70);
var dataGridPagerHeight = $('.grid-head-search-container').outerHeight();
var subHeight = pageHeight - pageSearchHeight - pageFastSearchHeight - dataGridPagerHeight - pageFooterHeight;
scope.dataGridHeight = subHeight - 70;
try {
$('#dx-tax-calendar-data-grid').dxDataGrid('instance').repaint();
}
catch (e) {
console.log(e);
}
};
$(window).on('resize', function () {
scope.setTaxGridHeight();
});
}
};
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfig/tax-calendar-config.less 0 → 100644
View file @ 3547477b
#tax-calendar-configuration {
background-color: #fff;
font-family: "微软雅黑";
.dx-texteditor-container, input, .dx-widget {
font-family: "微软雅黑";
}
tr {
font-family: "微软雅黑";
}
.dx-item {
font-family: "微软雅黑";
}
.dx-radiobutton-checked .dx-radiobutton-icon-dot{
background-color: #555;
}
.taxCalendarHead {
line-height: 60px;
vertical-align: middle;
padding-left: 20px;
display: inline-block;
border: 1px solid #dfdfdf;
width: 100%;
font-weight: bold;
}
.btn-default {
height: 30px;
line-height: 28px;
}
.btn-default-primary {
background-color: #777;
color: #fff;
}
.searchContainer {
margin-left: 25px;
margin-right: 25px;
margin-top: 25px;
border-radius: 4px;
width: calc(~"100%-50px");
height: auto;
line-height: 50px;
border: 1px solid #dfdfdf;
.search-line {
line-height: 50px;
display: inline-block;
width: calc(~"100%-16px");
margin: 0 6px;
.search-part-1 {
width: 38%;
display: inline-block;
}
.search-part-2 {
width: 32%;
display: inline-block;
}
.search-part-3 {
width: 14%;
display: inline-block;
}
.search-title-lable-2 {
width: 45px;
text-align: right;
display: inline-block;
}
.search-title-lable-3 {
text-align: right;
display: inline-block;
width: 60px;
}
.search-title-lable-4 {
width: 75px;
text-align: right;
display: inline-block;
}
.search-title-lable-7 {
width: 115px;
text-align: right;
display: inline-block;
}
.search-box-100-2 {
display: inline-block;
vertical-align: middle;
width: calc(~"100%-55px");
}
.search-box-100-4 {
display: inline-block;
vertical-align: middle;
width: calc(~"100%-80px");
}
.search-box-50-7 {
display: inline-block;
vertical-align: middle;
width: calc(~"50%-124px");
}
.search-box-50-4 {
display: inline-block;
vertical-align: middle;
width: calc(~"50%-80px");
}
.search-box-50-3 {
display: inline-block;
vertical-align: middle;
width: calc(~"50%-70px");
}
.btn-default {
line-height: 28px;
height: 30px;
min-width: 70px;
}
}
}
.grid-container {
width: calc(~"100%-50px");
margin: 25px;
.grid-head-search-container {
line-height: 45px;
display: inline-block;
width: 100%;
border-radius: 4px;
border-left: 1px solid #dfdfdf;
border-top: 1px solid #dfdfdf;
border-right: 1px solid #dfdfdf;
margin-bottom: -2px;
padding-left: 10px;
.grid-head-search {
display: inline-block;
vertical-align: middle;
}
.btn {
float: right;
vertical-align: middle;
height: 30px;
line-height: 28px;
margin-right: 25px;
border: 0;
margin-top: 10px;
margin-bottom: 10px;
}
.btn-red {
background-color: #df532a;
color: #fff;
}
}
#dx-tax-calendar-data-grid {
min-height: 200px;
}
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.js 0 → 100644
View file @ 3547477b
systemConfigurationModule.directive('taxCalendarConfigEdit', ['$log',
function ($log) {
'use strict';
$log.debug('taxCalendarConfigEdit.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.html' + '?_=' + Math.random(),
replace: true,
scope: {
calendarConfigId: '=',
isReadOnly: '='
},
controller: 'TaxCalendarConfigEditController',
link: function (scope, element) {
}
};
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.less 0 → 100644
View file @ 3547477b
#tax-calendar-configuration-edit {
background-color: #fff;
font-family: "微软雅黑";
.dx-texteditor-container, input, .dx-widget {
font-family: "微软雅黑";
}
.dx-radiobutton-checked .dx-radiobutton-icon-dot{
background-color: #555;
}
.taxCalendarHead {
line-height: 60px;
vertical-align: middle;
padding-left: 20px;
display: inline-block;
border: 1px solid #dfdfdf;
width: 100%;
font-weight: bold;
}
.taxCalendarForm {
margin-left: 5px;
margin-right: 5px;
margin-top: 15px;
border-radius: 4px;
width: calc(~"100%-12px");
height: auto;
line-height: 50px;
.edit-line {
line-height: 50px;
display: inline-block;
width: calc(~"100%-16px");
margin: 0 6px;
.right-link {
color: #df532a;
cursor: pointer;
margin-left: 15px;
text-decoration: underline;
&:hover {
color: #bf231a;
}
}
.col-user-define-left {
width: calc(~"50%-55px");
margin-left: 30px;
display: inline-block;
}
.col-user-define-right {
width: calc(~"50%-55px");
margin-left: 30px;
margin-right: 40px;
display: inline-block;
}
.col-descript-right {
width: calc(~"50%-160px");
margin-left: 45px;
margin-right: 10px;
display: inline-block;
background-color: #fee;
color: #b00;
border-radius: 4px;
padding: 15px 10px;
vertical-align: top;
margin-top: 10px;
}
.col-remark-right {
width: calc(~"50%-68px");
margin-left: 39px;
margin-right: 40px;
display: inline-block;
vertical-align: top;
margin-top: 15px;
}
.col-padding {
padding-left: 3px;
padding-right: 3px;
margin-top: 10px;
}
.form-box{
display: inline-block;
vertical-align: middle;
}
.yxrq-box {
width: calc(~"50%-127px") !important;
}
.bh-box {
width: calc(~"50%-170px");
}
.common-box {
width: calc(~"100%-230px");
}
.sssx-box {
width: calc(~"100%-115px");
}
.title-first {
width: 95px;
display: inline-block;
text-align: left;
}
.title-first-n {
width: 95px;
display: inline-block;
text-align: left;
padding-left: 10px;
}
.title-second {
width: 140px;
display: inline-block;
text-align: left;
}
.title-second-n {
width: 140px;
display: inline-block;
text-align: left;
padding-left: 7px;
}
.btn-default {
line-height: 28px;
height: 30px;
min-width: 70px;
}
}
.search-line-hide{
background-color: #fff;
padding-bottom:5px;
}
}
.taxCalendarFooter {
display: inline-block;
width: 100%;
padding-right: 125px;
margin-top: 30px;
.btn {
float: right;
vertical-align: middle;
height: 30px;
line-height: 28px;
margin-right: 25px;
border: 0;
}
.btn-red {
background-color: #df532a;
color: #fff;
}
.btn-gray {
color: #555;
background-color: #eee;
}
}
#edit-tax-project-pop, #edit-work-place-pop, #edit-tax-project, #edit-work-place, #user-promiss-check-container {
.form-title {
display: inline-block;
vertical-align: middle;
line-height: 36px;
}
.modal-footer {
display: inline-block;
margin-top: 10px;
padding-top: 20px;
width: 100%;
.btn {
float: right;
vertical-align: middle;
height: 30px;
line-height: 28px;
margin-right: 25px;
border: 0;
}
.btn-red {
background-color: #df532a;
color: #fff;
}
.btn-gray {
color: #555;
background-color: #eee;
}
}
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/adminApp.js
View file @ 3547477b
......@@ -4,7 +4,8 @@
var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', 'ui.event', 'pascalprecht.translate', 'ngMessages', 'ui.utils',
'ngRoute', 'ngCookies', 'ngSanitize', 'ct.ui.router.extras', 'chieffancypants.loadingBar', 'ngDraggable', 'ngFileUpload', 'LocalStorageModule', 'exceptionless',
'app.config', 'app.common', 'app.webservices', 'app.framework', 'app.infrastructure', 'app.basicData', 'app.adminHomePage', 'app.noPermissionPage', 'pasvaz.bindonce', 'vs-repeat', 'ivh.treeview', 'angular-cache',
'app.systemConfiguration', 'app.cache', 'angularBootstrapNavTree', 'ngAnimate', 'cgNotify', 'angularInlineEdit'
'app.systemConfiguration', 'app.cache', 'angularBootstrapNavTree', 'ngAnimate', 'cgNotify', 'angularInlineEdit',
// 'app.taxCalendar'
])
//run blocks are executed after the injector is created and are the first
//methods that are executed in any Angular app.
......
atms-web/src/main/webapp/app/adminModule.js
View file @ 3547477b
......@@ -644,6 +644,44 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
sticky: true
});
$stateProvider.state({
name: 'taxCalendarConfiguration',
url: '/taxCalendarConfiguration',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.systemConfiguration]);
}],
template: '<tax-calendar-config></tax-calendar-config>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.systemConfiguration),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'taxCalendarConfigurationEdit',
url: '/taxCalendarConfigurationEdit?{id:string}&{isReadOnly:int}',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
$scope.calendarConfigId = $stateParams.id;
$scope.isReadOnly = $stateParams.isReadOnly;
appTranslation.load([appTranslation.systemConfiguration]);
}],
template: '<tax-calendar-config-edit calendar-config-id="calendarConfigId" is-read-only="isReadOnly"></tax-calendar-config-edit>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.systemConfiguration),
deepStateRedirect: true,
sticky: true
});
$stickyStateProvider.enableDebug(true);
}]);
......
atms-web/src/main/webapp/app/backlogManage/backlog-calendar/backlog-calendar.js deleted 100644 → 0
View file @ c1e6f59d
backlogManageModule.directive('backlogCalendar', ['$log',
function ($log) {
'use strict';
console.log('backlogCalendar.ctor()...');
return {
restrict: 'E',
templateUrl: 'app/backlogManage/backlog-calendar/backlog-calendar.html' + '?_=' + Math.random(),
scope: {
},
controller: 'backlogCalendarController',
link: function ($scope, element) {
$('.main-contents')[0].style.width = "260px";
$('.data-import-contents')[0].style.display = "block";
$('.main-contents')[0].style.float = "left";
$('.main-contents')[0].style.styleFloat = "left";
$('.main-contents')[0].style.cssFloat = "left";
}
};
}
]);
atms-web/src/main/webapp/app/backlogManage/backlog-calendar/backlog-calendar.svc.js deleted 100644 → 0
View file @ c1e6f59d
/**
* Created by Administrator on 2019/3/1 0001.
*/
backlogManageModule.factory('backlogCalendarService',
['$q', 'apiConfig', 'jqFetch','apiInterceptor',
function ($q, apiConfig, jqFetch,apiInterceptor) {
'use strict';
return {
queryTypeForCalendar: function () {
return jqFetch.get(apiInterceptor.webApiHostUrl + '/backlogManage/backlog/calendar/type');
}
};
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/backlogManage/backlog-calendar/backlog-manage.less deleted 100644 → 0
View file @ c1e6f59d
@charset "utf-8";
body {
font-family: 'Noto Sans', sans-serif;
color: '#333';
font-size: 12px;
}
/** custom bootstrap - start */
.btn {
border-radius: 25px;
border-color: #ddd;
}
.btn:hover {
border: solid 1px #bbb;
background-color: #fff;
}
.btn:active {
background-color: #f9f9f9;
border: solid 1px #bbb;
outline: none;
}
.btn:disabled {
background-color: #f9f9f9;
border: solid 1px #ddd;
color: #bbb;
}
.btn:focus:active, .btn:focus, .btn:active {
outline: none;
}
.open > .dropdown-toggle.btn-default {
background-color: #fff;
}
.dropdown-menu {
top: 25px;
padding: 3px 0;
border-radius: 2px;
border: 1px solid #bbb;
}
.dropdown-menu > li > a {
padding: 9px 12px;
cursor: pointer;
}
.dropdown-menu > li > a:hover {
background-color: rgba(81, 92, 230, 0.05);
color: #333;
}
.bi15 {
width: 15px;
height: 15px;
}
/** custom fontawesome - end */
.calendar-icon {
width: 14px;
height: 14px;
}
#top {
height: 49px;
border-bottom: 1px solid #bbb;
padding: 16px;
font-size: 10px;
}
#lnb {
position: absolute;
left: 260px;
width: 220px;
top: 60px;
bottom: 0;
border-right: 1px solid #d5d5d5;
padding: 12px 10px;
background: #fafafa;
}
#right {
position: absolute;
left: 480px;
top: 60px;
right: 0;
bottom: 0;
}
#lnb label {
margin-bottom: 0;
cursor: pointer;
}
.lnb-new-schedule {
padding-bottom: 12px;
border-bottom: 1px solid #e5e5e5;
}
.lnb-new-schedule-btn {
height: 100%;
font-size: 14px;
background-color: #ff6618;
color: #ffffff;
border: 0;
border-radius: 25px;
padding: 10px 20px;
font-weight: bold;
}
.lnb-new-schedule-btn:hover {
height: 100%;
font-size: 14px;
background-color: #e55b15;
color: #ffffff;
border: 0;
border-radius: 25px;
padding: 10px 20px;
font-weight: bold;
}
.lnb-new-schedule-btn:active {
height: 100%;
font-size: 14px;
background-color: #d95614;
color: #ffffff;
border: 0;
border-radius: 25px;
padding: 10px 20px;
font-weight: bold;
}
.lnb-calendars > div {
padding: 12px 16px;
border-bottom: 1px solid #e5e5e5;
font-weight: normal;
}
.lnb-calendars-d1 {
padding-left: 8px;
}
.lnb-calendars-d1 label {
font-weight: normal;
}
.lnb-calendars-item {
min-height: 14px;
line-height: 14px;
padding: 8px 0;
}
.lnb-footer {
color: #999;
font-size: 11px;
position: absolute;
bottom: 12px;
padding-left: 16px;
}
#menu {
padding: 16px;
}
#dropdownMenu-calendarType {
padding: 0 8px 0 11px;
}
#calendarTypeName {
min-width: 62px;
display: inline-block;
text-align: left;
line-height: 30px;
}
.move-today {
padding: 0 16px;
line-height: 30px;
}
.move-day {
padding: 8px;
font-size: 0;
}
#renderRange {
padding-left: 12px;
font-size: 19px;
vertical-align: middle;
}
.dropdown-menu-title .calendar-icon {
margin-right: 8px;
}
.calendar-bar {
width: 16px;
height: 16px;
margin-right: 5px;
display: inline-block;
border: 1px solid #eee;
vertical-align: middle;
}
.calendar-name {
font-size: 14px;
font-weight: bold;
vertical-align: middle;
}
.schedule-time {
color: #005aff;
}
#calendar {
position: absolute;
left: 0;
right: 0;
bottom: 5px;
top: 64px;
}
/** custom fontawesome */
//.fa {
// width: 12px;
// height: 12px;
// margin-right: 2px;
//}
.weekday-grid-more-schedules {
float: right;
margin-top: 4px;
margin-right: 6px;
height: 18px;
line-height: 17px;
padding: 0 5px;
border-radius: 3px;
border: 1px solid #ddd;
font-size: 12px;
text-align: center;
color: #000;
}
/* font icons */
@font-face {
font-family: 'tui-calendar-font-icon';
src: url('/app-resources/fonts/icon.eot') format('embedded-opentype'),
url('/app-resources/fonts/icon.ttf') format('truetype'),
url('/app-resources/fonts/icon.woff') format('woff'),
url('/app-resources/fonts/icon.svg') format('svg');
}
.calendar-icon {
width: 14px;
height: 14px;
display: inline-block;
vertical-align: middle;
}
.calendar-font-icon {
font-family: 'tui-calendar-font-icon';
font-size: 10px;
font-weight: normal;
}
.img-bi {
background: url('/app-resources/images/tuiCalendar/img-bi.png') no-repeat;
width: 215px;
height: 16px;
}
.ic_view_month {
background: url('/app-resources/images/tuiCalendar/ic-view-month.png') no-repeat;
}
.ic_view_week {
background: url('/app-resources/images/tuiCalendar/ic-view-week.png') no-repeat;
}
.ic_view_day {
background: url('/app-resources/images/tuiCalendar/ic-view-day.png') no-repeat;
}
.ic-arrow-line-left {
background: url('/app-resources/images/tuiCalendar/ic-arrow-line-left.png') no-repeat;
}
.ic-arrow-line-right {
background: url('/app-resources/images/tuiCalendar/ic-arrow-line-right.png') no-repeat;
}
.ic-travel-time {
background: url('/app-resources/images/tuiCalendar/ic-traveltime-w.png') no-repeat;
}
/* font icons */
.ic-location-b:before {
content: '\e900';
}
.ic-lock-b:before {
content: '\e901';
}
.ic-milestone-b:before {
content: '\e902';
}
.ic-readonly-b:before {
content: '\e903';
}
.ic-repeat-b:before {
content: '\e904';
}
.ic-state-b:before {
content: '\e905';
}
.ic-user-b:before {
content: '\e906';
}
atms-web/src/main/webapp/app/backlogManage/backlog-case/backlog-case.js deleted 100644 → 0
View file @ c1e6f59d
backlogManageModule.directive('backlogCase', ['$log', 'browserService', '$translate', 'region', '$timeout',
function ($log, browserService, $translate, region, $timeout) {
$log.debug('backlogCase.ctor()...');
return {
restrict: 'E',
templateUrl: 'app/backlogManage/backlog-case/backlog-case.html' + '?_=' + Math.random(),
scope: {},
controller: 'backlogCaseController',
link: function ($scope, element) {
$('.main-contents')[0].style.width = "260px";
$('.data-import-contents')[0].style.display = "block";
$('.main-contents')[0].style.float = "left";
$('.main-contents')[0].style.styleFloat = "left";
$('.main-contents')[0].style.cssFloat = "left";
}
}
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/calendar/display/calendars.js 0 → 100644
View file @ 3547477b
This diff is collapsed.
atms-web/src/main/webapp/app/calendar/display/icon.less 0 → 100644
View file @ 3547477b
This diff is collapsed.
atms-web/src/main/webapp/app/calendar/display/schedules.js 0 → 100644
View file @ 3547477b
This diff is collapsed.
atms-web/src/main/webapp/app/calendar/display/theme.js 0 → 100644
View file @ 3547477b
This diff is collapsed.
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