Skip to content

T
traffic-front
Commit dc88ffd1 authored by gary's avatar gary
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql 

# Conflicts:
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
parents 9cd44d6f dac479fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 45 deletions
atms-api/pom.xml
View file @ dc88ffd1
......@@ -240,12 +240,6 @@
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.10</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
......
atms-web/src/main/webapp/Gruntfile.js
View file @ dc88ffd1
......@@ -339,12 +339,12 @@ grunt.initConfig({
dest: '<%= pkg.bundleTemp %>/taxDocumentManage.js'
},
appJs: {
src: ["Scripts/app.js",
"Scripts/app.config.js",
"Scripts/module-part1.js",
"Scripts/module-part2.js",
"Scripts/module-part3.js",
"Scripts/module-part4.js"
src: ["app/app.js",
"app/app.config.js",
"app/module-part1.js",
"app/module-part2.js",
"app/module-part3.js",
"app/module-part4.js"
],
dest: '<%= pkg.bundleTemp %>/app.js'
},
......@@ -368,7 +368,11 @@ grunt.initConfig({
files: {
'<%= pkg.bundleDest %>/less/vat.less': "app/vat/**/*.less"
}
}
},
citCss: {
src: "app/cit/**/*.css",
dest: '<%= pkg.bundleDest %>/cit.css'
},
},
less: {
......@@ -511,7 +515,8 @@ grunt.registerTask('dev', '开发环境', function () {
grunt.task.run(['concat:adminHomePageJs', 'concat:adminHomePageLess','concat:basicDataJs',
'concat:basicDataLess', 'concat:systemConfigurationJs','concat:systemConfigurationLess',
'concat:basicDataCss', 'concat:infrastructureJs','concat:infrastructureLess',
'concat:commonCss', 'concat:commonLess','concat:adminApp','concat:noPermissionPageJs','concat:noPermissionPageLess','concat:citJs','concat:citLess',
'concat:commonCss', 'concat:commonLess','concat:adminApp','concat:noPermissionPageJs','concat:noPermissionPageLess',
'concat:citJs','concat:citCss','concat:citLess',
'concat:commonJs', 'concat:frameworkJs','concat:frameworkLess',
'concat:taxDocumentManageLess', 'concat:taxDocumentManageJs','concat:appJs',
'concat:vatJs', 'concat:vatCss','concat:vatLess',
......
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ dc88ffd1
......@@ -103,7 +103,6 @@
<script type="text/javascript" src="bundles/common.js"></script>
<script type="text/javascript" src="bundles/framework.js"></script>
<script type="text/javascript" src="bundles/taxDocumentManage.js"></script>
<script type="text/javascript" src="bundles/cit.js"></script>
<script type="text/javascript" src="bundles/cldr.js"></script>
<script type="text/javascript" src="bundles/globalize.js"></script>
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ dc88ffd1
......@@ -285,7 +285,11 @@
"cellCommentReplyEmptyMsg": "Please input content",
"chartsetting": "Chart settings",
"dashboard": "Data summary",
"dateFormat4YearMonth": " yyyy 年 mm 月",
"dateFormat4Year": " yyyy ",
"dateFormat4YearMonth": " yyyy-mm ",
"dateFormat4YearMonthDay": "yyyy-mm-dd",
"dateFormat4YearMonthDayCh": "yyyy-mm-dd",
"dateFormat4YearMonthForDX": "yyyy-MM",
"fileupload": "File upload",
"log": "Log",
"logoff": "Log off",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ dc88ffd1
{}
\ No newline at end of file
{
"@HowToUse": "在提交前，使用PWC.sortJson()对json内容进行排序",
"1stQuarterlyCITFilingReturn": "1st Quarterly CIT Filing Return",
"2ndQuarterlyCITFilingReturn": "2nd Quarterly CIT Filing Return",
"3rdQuarterlyCITFilingReturn": "3rd Quarterly CIT Filing Return",
"4thQuarterlyCITFilingReturn": "4th Quarterly CIT Filing Return",
"AllTask": "All",
"AnnualCITFilingReturn": "Annual CIT Filing Return",
"AnnualCITFilingWorkingPaper": "Annual CIT Filing Working Paper",
"AuditFeedback": "Tax audit feedback",
"AuditImplementation": "Tax audit implementation",
"AuditNotice": "Tax audit notice",
"AuditReport": "Audit report",
"AuditSolution": "Tax audit solution",
"BNDKJTXE": "Amortization in current year:",
"BS": "Balance sheet",
"BankGroup": "Certificate of bank and group",
"Cancellation": "Establishment, liquidation and cancellation of branches",
"CompleteTask": "Completed",
"CreateTask": "Create Task",
"CreditRecord": "Tax credit record",
"DFFSETotal": "Total Credit Amt:",
"DFJETotal": "Total Credit Amt:",
"DataProcessDataName_AnnualSettlement": "Annual CIT Filing Return",
"DataProcessDataName_CITFirstQuarterly": "1st Quarter",
"DataProcessDataName_CITForthQuarterly": "4th Quarter",
"DataProcessDataName_CITQuarterly": "Quarterly CIT Filing Return",
"DataProcessDataName_CITSecondQuarterly": "2nd Quarter",
"DataProcessDataName_CITThirdQuarterly": "3rd Quarter",
"DataProcessDataName_UpdateReportConfig": "Update Report Configuration",
"DataProcessDataName_FinanceReport": "Financial Report",
"DataProcessDataName_GenerateReport": "Generate Report",
"DataProcessDataName_ModelAnalysis": "Model Analytics",
"DataProcessDataName_UpdateTB": "Update Trial Balance",
"DataProcessDataName_YearWorkPaper": "Annual CIT Filing Working Paper",
"DataProcessData_Generate": "Generate",
"DataProcessData_PreGenerate": "Generate",
"DataProcessData_Update": "Update",
"DepreciationCurrentYearTotal": "Total Depreciation",
"DepreciationPerTaxCurrentYearTotal": "Total Tax Depreciation",
"DividendReturn": "Dividend return",
"DueDate": "Due Date",
"FinancialReport": "Financial Report",
"InprogressTask": "In Progress",
"JFFSETotal": "Total Debit Amt:",
"JFJETotal": "Total Debit Amt:",
"NeedToUpdate": "Need to update",
"NotBeginTask": "Not Started",
"OtherRecordFiling": "Other record filing",
"OutDateTask": "Overdue",
"OutOfDateTask": "Overdue",
"PL": "Profit and Loss statement",
"PZCITCount": "Total Records:",
"Planning": "Tax planning",
"PleaseSelectAtLeastOneItem": "Please select at least one item!",
"ProfitAndLossStatement": "Profit and Loss statement",
"QCYETotal": "Total Begin Balance:",
"QMYETotal": "Total End Balance:",
"QNDKJZJE": "Depreciation last year:",
"QuarterlyCITFilingReturn": "Quarterly CIT Filing Return",
"RecordFiling": "Record filing of tax deduction on asset loss",
"SpecialTasks": "Special tax tasks",
"TBDataNum": "Total Records:",
"TaskDescription": "Description",
"TaskEntity": "Entity",
"TaskName": "Task Name",
"TaxInspection": "Tax inspection",
"TaxStatistics": "Investigation and statistics from tax bureau",
"TaxTaskManage": "Tax Task Management",
"TaxTaskType": "Task Type",
"ThisWeek": "This Week",
"Today": "Today",
"WaitCompleteTask": "In Progress",
"dateFormat4YearMonthDay": "yyyy-mm-dd",
"noData": "No Data",
"toUpdate": "To be updated",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ dc88ffd1
......@@ -1549,6 +1549,7 @@
"completed": "Completed",
"customInvoice": "Customs verification",
"dataMapping": "Data mapping",
"dateFormat4Year": " yyyy",
"dateFormat4YearMonth": " yyyy - mm",
"dateFormat4YearMonthDay": "yyyy-mm-dd",
"deleteChart": "确定删除图表",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ dc88ffd1
......@@ -1818,6 +1818,8 @@
"showData": "显示数据",
"showGrid": "显示表格",
"startCaculateData": "开始处理",
"ReportExportConfirm": "报表数据还未保存，操作结果可能和实际不一致，确定要执行这个操作吗？",
"LeaveReport": "报表数据还未保存，确定要离开页面吗？离开会导致数据丢失。",
"stepchart": "阶梯图",
"switchValue": "显示数值",
"taxDashboard": "税务指标仪表盘",
......@@ -1978,4 +1980,18 @@
"DirectMethodCashFlowStatementTitle": "直接法现金流量表",
"~MustBeEndOneApp": "我必须是最后一个！"
"~MustBeEndOneApp": "我必须是最后一个！",
"DataSourceFilter": "数据源筛选",
"PleaseSelectDatabase": "请选择数据库",
"PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件",
"Filter": "筛选",
"PleaseSelectTheField": "请选择字段",
"originator":"Originator",
"associatedSchedule":"Associated Schedule",
"associatedCell":"Associated Cell",
"currentReviewNotesDetails":"Current Review Notes Details",
"ImportFixedAssets":"导入固定资产",
"FixedAssetsMapping":"FA对应关系",
"PleaseFillinAllDataField": "请输入数据源筛选条件"
}
\ No newline at end of file
atms-web/src/main/webapp/app/adminApp.js
View file @ dc88ffd1
......@@ -91,7 +91,7 @@ var app = angular.module('adminApp', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.t
.config(['$logProvider', '$translateProvider', '$translatePartialLoaderProvider', 'region', '$compileProvider',
function ($logProvider, $translateProvider, $translatePartialLoaderProvider, region, $compileProvider) {
'use strict';
region = 'zh-CN';
// to disable various debug runtime information in the compiler to DOM elements.
$compileProvider.debugInfoEnabled(false);
// enable output $log.debug by default
......
atms-web/src/main/webapp/app/app.js
View file @ dc88ffd1
......@@ -119,6 +119,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
urlTemplate: '/app-resources/i18n/{lang}/{part}.json'
});
region = window.localStorage.langTemp || region;
$translateProvider
.preferredLanguage(region)
.fallbackLanguage(region);
......@@ -302,9 +303,9 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
return translation;
}
])
.controller('AppController', ['$scope', '$log', '$location', '$translate', '$translatePartialLoader',
.controller('AppController', ['$rootScope','$scope', '$log', '$location', '$translate', '$translatePartialLoader',
'$window', 'appRoute', 'application', 'appTranslation', '$timeout', '$uibModal', 'loginContext', '$ExceptionlessClient', 'signalRSvc',
'exceptionlessServerURL', function ($scope, $log, $location, $translate, $translatePartialLoader, $window, appRoute,
'exceptionlessServerURL', function ($rootScope,$scope, $log, $location, $translate, $translatePartialLoader, $window, appRoute,
application, appTranslation, $timeout, $uibModal, loginContext, $ExceptionlessClient, signalRSvc, exceptionlessServerURL) {
'use strict';
$log.debug('AppController.ctor()...');
......@@ -332,6 +333,28 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
$log.debug('$stateChangeSuccess: ');
});
var langs = {};
try {
var obj= JSON.parse(window.localStorage.lang);
if(typeof obj == 'object' && obj ){
langs = obj;
}
} catch(e) {}
var region = langs[loginContext.userName] || 'en-us';
var flag = window.localStorage.langTemp;
$rootScope.changeLanguage = function(lang){
$translate.use(lang);
appTranslation.loadAll();
$rootScope.currentLanguage = lang;
$rootScope.currentLanguageDesc = $rootScope.currentLanguage == 'en-us' ? 'Switch to Chinese':'切换至英文';
langs[loginContext.userName] = lang;
window.localStorage.lang = JSON.stringify(langs);
window.localStorage.langTemp = lang;
if(flag !== window.localStorage.langTemp){
window.location.reload();
}
};
$rootScope.changeLanguage(region);
// publish unbeforeunload event to child scopes
$scope.onbeforeunload = function () {
......
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ dc88ffd1
......@@ -148,10 +148,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
$scope.importIcon = 'fa fa-adjust';
$scope.serviceTypeId = enums.serviceType.CIT;
getMenuList();
getImportTables().then(function (tableInfoList) {
vatCommonService.isLayoutMenuShow(vatSessionService.project.dbName, citSessionService.month,
$scope.nodeDicKey, $scope.linkShort, $scope.menus, tableInfoList);
});
// getImportTables().then(function (tableInfoList) {
// vatCommonService.isLayoutMenuShow(vatSessionService.project.dbName, citSessionService.month,
// $scope.nodeDicKey, $scope.linkShort, $scope.menus, tableInfoList);
// });
})();
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.html
View file @ dc88ffd1
......@@ -2,7 +2,7 @@
<div class="vat-import-menu">
<div class="vat-import-menu">
<perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20">
<div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="menu.show">
<div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="true">
<a ui-sref-active="active" ui-sref=".{{::menu.name}}">
<i ng-show="menu.name==='balanceSheet' && errorCount !== 0" class="fa fa-circle" style="/* display: block; *//* padding-bottom: 10px; */color: rgb(255, 140, 60);/* float: left; *//* padding-right: 10px; */margin-left: 40px;font-size: 10px;" aria-hidden="true"></i>
<i class="{{::menu.icon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i>
......
atms-web/src/main/webapp/app/common/controls/ack-pagination/ack-pagination.html
View file @ dc88ffd1
<div class="ack-page">
<div class="ack-footer">
<div class="page-size">
<span>共有<span class="total-number">{{pagingOptions.totalItems}}</span>条记录</span>
<span class="padding-span" ng-show="!hideSelector">每页显示</span>
<select class="padding-span page-box" ng-model="pagingOptions.pageSizeString" ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector">
<option ng-repeat="option in pagingOptions.pagingSelection" value="{{option.id}}">{{option.value}}</option>
</select>
<span class="padding-span" ng-show="!hideSelector">条记录</span>
<span class="padding-span" ng-show="!hideSelector">跳至 <span class="padding-span"><input class="page-box " type="number" ng-change="pagingService.pageIndexChanging()" ng-model="pagingOptions.pageIndex" /></span>&nbsp;页</span>
<!--共有-->
<span>{{'TotalPage'| translate}}<span class="total-number">{{pageOptions.totalItems}}</span>{{'RecordCount' | translate}}</span>
<!--每页显示-->
<span class="padding-span" ng-show="!hideSelector">{{'RowForPage'| translate}}</span>
<span class="padding-span" ng-show="!hideSelector">当前页 <span class="normal-number">{{pagingOptions.pageIndex}}</span>/<span class="normal-number">{{pagingOptions.totalPages}}</span></span>
<select class="padding-span page-box" ng-model="pageOptions.pageSizeString" ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector">
<option ng-repeat="option in pageOptions.pagingSelection" value="{{option.id}}">{{option.value}}</option>
</select>
<!--条记录-->
<span class="padding-span" ng-show="!hideSelector">{{'RecordCount' | translate}}</span>
<!--跳至-->
<span class="padding-span" ng-show="!hideSelector">{{'JumpTo' | translate}} <span class="padding-span"><input class="page-box " type="number" ng-change="pagingService.pageIndexChanging()" ng-model="pageOptions.pageIndex" /></span>&nbsp;{{'Page' | translate}}</span>
<!--当前页-->
<span class="padding-span" ng-show="!hideSelector">{{'CurrentPage' | translate}} <span class="normal-number">{{pageOptions.pageIndex}}</span>/<span class="normal-number">{{pageOptions.totalPages}}</span></span>
</div>
<ul uib-pagination total-items="pagingOptions.totalItems" items-per-page="pagingOptions.pageSize" ng-model="pagingOptions.pageIndex" num-pages="pagingOptions.totalPages" max-size="pagingOptions.maxSize" class="pagination-sm"
boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true" boundary-links="true" first-text="{{pagingOptions.firstPage}}" previous-text="{{pagingOptions.previousPage}}" last-text="{{pagingOptions.lastPage}}" next-text="{{pagingOptions.nextPage}}"></ul>
<ul uib-pagination total-items="pageOptions.totalItems" items-per-page="pageOptions.pageSize" ng-model="pageOptions.pageIndex" num-pages="pageOptions.totalPages" max-size="pageOptions.maxSize" class="pagination-sm"
boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true" boundary-links="true" first-text="{{pageOptions.firstPage}}" previous-text="{{pageOptions.previousPage}}" last-text="{{pageOptions.lastPage}}" next-text="{{pageOptions.nextPage}}"></ul>
</div>
</div>
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ dc88ffd1
......@@ -569,10 +569,107 @@ constant.vatPermission = {
queryCode: '02.007.008.001',
editCode: '02.007.008.002',
}
}
};
// cit权限code
constant.citPermission = {
dataImport: {
dataImportCode: '03.001',
balanceSheet: {
queryCode: '03.001.001',
importCode: '03.001.002'
},
journalEntry: {
queryCode: '03.001.003',
importCode: '03.001.004'
},
erpImport: {
queryCode: '03.001.005',
importCode: '03.001.006'
},
auditAdjust: {
queryCode: '03.001.007',
importCode: '03.001.008'
},
documentList: {
queryCode: '03.001.009',
importCode: '03.001.010'
},
assetList: {
queryCode: '03.001.011',
importCode: '03.001.012'
},
},
dataPreview: {
dataPreviewCode: '03.002',
balanceSheet: {
queryCode: '03.002.001'
},
accountVoucher: {
queryCode: '03.002.002'
},
},
dataManage: {
dataManageCode: '03.003',
accountMappingCode: '03.003.001',
accountMapping: {
queryCode: '03.003.001.001',
importCode: '03.003.001.002'
},
caculateDataCode: '03.003.002',
},
reportView: {
reportViewCode: '03.004',
bsplCode: '03.004.001',
bspl: {
bsCode: '03.004.001.001',
plCode: '03.004.001.002'
},
quarterlyFilingReturnTypeCode: '03.004.002',
quarterlyFilingReturnType: {
queryCode: '03.004.002.001',
editCode: '03.004.002.002',
submitCode: '03.004.002.003',
reviewCode: '03.004.002.004',
},
workingPaperTypeCode: '03.004.003',
workingPaperType: {
queryCode: '03.004.003.001',
editCode: '03.004.003.002',
submitCode: '03.004.003.003',
reviewCode: '03.004.003.004',
},
taxReturnCode: '03.004.004',
taxReturn: {
queryCode: '03.004.004.001',
editCode: '03.004.004.002',
submitCode: '03.004.004.003',
reviewCode: '03.004.004.004',
approveCode: '03.004.004.005',
taxVoucherCode: '03.004.004.006',
},
otherReportCode: '03.004.005',
otherReport: {
queryCode: '03.004.005.001',
editCode: '03.004.005.002',
submitCode: '03.004.005.003',
reviewCode: '03.004.005.004',
},
},
dataAnalysis: {
dataAnalysisCode: '03.005',
modelAnalysisCode: '03.005.001',
modelAnalysis: {
queryCode: '03.005.001.001',
filterCode: '03.005.001.005'
},
dashboard: {
dashboardCode: '03.005.002',
querySummaryDashboardCode: '03.005.002.001',
singleOrgIndexDashboardCode: '03.005.002.002',
}
},
};
// 权限代码
......@@ -711,6 +808,28 @@ constant.adminPermission = {
}
};
constant.citMenuList = [
constant.citPermission.dataImport.balanceSheet.queryCode,
constant.citPermission.dataImport.journalEntry.queryCode,
constant.citPermission.dataImport.erpImport.queryCode,
constant.citPermission.dataImport.auditAdjust.queryCode,
constant.citPermission.dataImport.documentList.queryCode,
constant.citPermission.dataImport.assetList.queryCode,
constant.citPermission.dataPreview.balanceSheet.queryCode,
constant.citPermission.dataPreview.accountVoucher.queryCode,
constant.citPermission.dataManage.accountMappingCode,
constant.citPermission.dataManage.caculateDataCode,
constant.citPermission.reportView.bsplCode,
constant.citPermission.reportView.quarterlyFilingReturnTypeCode,
constant.citPermission.reportView.workingPaperTypeCode,
constant.citPermission.reportView.taxReturnCode,
constant.citPermission.reportView.otherReportCode,
constant.citPermission.dataAnalysis.modelAnalysisCode,
constant.citPermission.dataAnalysis.dashboard.dashboardCode,
];
constant.basicDataUrl = {
orangizationStructureManage: '#/masterData/orangizationStructureManage',
businessUnit: '#/masterData/businessUnit',
......
atms-web/src/main/webapp/app/common/utils/enums.js
View file @ dc88ffd1
......@@ -577,6 +577,11 @@ commonModule.factory('enums', ['$translate', function ($translate) {
},
/*************************************cit enum start**************************************/
wholeYearPeriod: {
import: -1, // 导入模块中代表全年的期间
report: 0, // 报表模块中代表全年的期间
model: 13 // 模型模块中代表全年的期间
},
erpCheckTypeId: {
Tb_NoAcctCode: 30,//Tb验证 科目不在科目表中
......@@ -599,6 +604,24 @@ commonModule.factory('enums', ['$translate', function ($translate) {
Error: 4 //错误
},
//对应PwC.Tax.Tech.Atms.Globals.Utils:EnumValidationType
EnumValidationType:
{
TrialBalance: 0,
InputVoice: 1,
OutputVoice: 2,
ErpDuplicate: 3, //重复数据
ErpBasicCheck: 4,//基础数据校验
ErpCorrect: 5,//数据正确性
JournalEntry: 6,
InputVoiceItem: 7,
CustomInvoice: 8,
AccountMapping: 9,
InvoiceMapping: 10,
VoucherMapping: 11,
AssetDiffData: 12
},
//对应PwC.Tax.Tech.Atms.Globals.Utils:ErpCheckType
ErpCheckTypeEnum:
{
......
atms-web/src/main/webapp/app/common/vatservices/dataProcessService.js 0 → 100644
View file @ dc88ffd1
// web service proxy for voucher
webservices.factory('dataProcessService', ['$log', 'vatReportService', function ($log, vatReportService) {
'use strict';
function Job(serviceType, tplId, month, status) {
this.serviceType = serviceType;
this.tplId = tplId;
this.month = month;
this.status = status;
}
var jobsArr = [];
//执行更新项目状态的任务
function status_job() {
var job = jobsArr.shift();
if (job) {
//更新每个状态值
vatReportService.updateProcInfo(job.serviceType, job.tplId, job.month, job.status).then(function (resData) {
setTimeout(status_job, 100);
$log.log("status_job request: " + job.tplId + ", " + job.status);
});
} else {
setTimeout(status_job, 1000);
}
}
//页面容错机制
//1. 后台查询当前项目有没有正在 处理中的报表， 间隔连续两次没查询到，证明没有处理中的，更新页面状态
var timeInterval = 15 * 1000;
var noProcItemCount = 0;
var _serviceType, _projectId, _month, _status,_cb;
function heartBeat() {
vatReportService.heartBeat(_projectId, _month).then(function (resData) {
//if ($scope.isStartProcData) {//如果是当前处理页面
$log.info("heartBeat......" + noProcItemCount);
if (resData && resData.data.result) {
//没有处理中加一次
noProcItemCount++;
//超过两次，就更新状态
if (noProcItemCount > 3) {
//1. 更新项目状态，当前项目状态更改为 处理已完成
//vatReportService.updateProcInfo($scope.serviceType, vatSessionService.project.id, vatSessionService.month, getStatus('completed')).then(function (resData) {
vatReportService.updateProcInfo(_serviceType, _projectId, _month, _status).then(function (resData) {
//更新页面状态
_cb();
timeInterval = 60 * 1000;//60s
});
//注意后台要考虑的问题， 为了防止 signalR 的断线情况，将报表完成状态放到后台更新，前台通知更新显示而已
}
} else {
//表示有处理中
noProcItemCount = 0;
}
if (noProcItemCount == 0) {
timeInterval = 60 * 1000 * 3;//正在处理中，降低频率
} else {
timeInterval = 15 * 1000;
}
setTimeout(heartBeat, timeInterval);
//}
});
}
return {
startJob: function () {
setTimeout(status_job, 100);
},
addJob: function (serviceType, tplId, month, status) {
jobsArr.push(new Job(serviceType, tplId, month, status));
},
startHeartBeat: function (serviceType, projectId, month, status,cb) {
_serviceType = serviceType;
_projectId = projectId;
_month = month;
_status = status;
_cb = cb;
setTimeout(heartBeat, timeInterval);
}
};
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatImportService.js
View file @ dc88ffd1
......@@ -349,6 +349,53 @@
/************************************************CustomsInvoice*********************************************************/
/***************************************批量数据导入服务 start**************************************************************/
getAllTables: function (serviceType) {
return $http.get('/DataImport/getAllTables/' + serviceType, apiConfig.createVat());
},
getTableInfoList: function (serviceType, orgID) {
return $http.get('/DataImport/getTableInfoList/' + serviceType + '/' + orgID, apiConfig.createVat());
},
getMappedList: function (tableInfoId, orgID) {
return $http.get('/DataImport/getMappedList/' + tableInfoId + '/' + orgID, apiConfig.createVat());
},
getTableMenuList: function () {
return $http.get('/DataImport/getTableMenuList', apiConfig.createVat());
},
getTempFileContent: function (tempFileName, selectedSheetIndex, topRowNumber) {
return $http.get('/DataImport/TempFileContent/' + tempFileName + '/' + selectedSheetIndex + '/' + topRowNumber, apiConfig.createVat());
},
importData: function (importDto) {
return $http.post('/DataImport/importData', importDto, apiConfig.createVat());
},
GetDataFromExcelByChunk: function (ChunkDto) {
return $http.post('/DataImport/getDataFromExcelByChunk', ChunkDto, apiConfig.createVat());
},
GetDataFromExcelByChunkByBack: function (ChunkDto) {
return $http.post('/DataImport/getDataFromExcelByChunkByBack', ChunkDto, apiConfig.createVat());
},
getImportedData: function (queryDto) {
return $http.post('/DataImport/getImportedData', queryDto, apiConfig.createVat());
},
getFilterImportedData: function (queryDto) {
return $http.post('/DataImport/getFilterImportedData', queryDto, apiConfig.createVat());
},
getSelectedFilterImportedData: function (queryDto) {
return $http.post('/DataImport/getSelectedFilterImportedData', queryDto, apiConfig.createVat());
},
getPeriodList: function (tableInfoId) {
return $http.get('/DataImport/getPeriodList/' + tableInfoId, apiConfig.createVat());
},
deleteDataByPeriod: function (period, tableInfoId) {
return $http.get('/DataImport/deleteDataByPeriod/' + period + '/' + tableInfoId, apiConfig.createVat());
}
/***************************************批量数据导入服务 end**************************************************************/
};
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js
View file @ dc88ffd1
......@@ -214,9 +214,9 @@
$scope.dateFormat = $translate.instant('dateFormat4Year');
}
if ($scope.serviceTypeId === enums.serviceType.VAT) {
$scope.systemTitle = $translate.instant('增值税申报');
$scope.systemTitle = $translate.instant('MenuVAT');
$scope.viewMode = 1;
$scope.dateFormat = $translate.instant(' yyyy 年 mm 月');
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
}
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ dc88ffd1
......@@ -48,10 +48,13 @@
<span style="margin-left: 02px; font-size: 15px;cursor:pointer;">{{loginUserName | limitString:10}}</span>
<i class="fa fa-sort-down"></i>
</div>
<div class="user-menu">
<div class="user-menu" style="width:150px;">
<a ng-click="showChangePassword()" id="userManageMenu">
<p>{{'ChangePassword' | translate}}</p>
</a>
<a href="" ng-click="$root.changeLanguage($root.currentLanguage == 'en-us' ? 'zh-CN' : 'en-us')" id="userManageMenu">
<p>{{$root.currentLanguageDesc}}</p>
</a>
</div>
</div>
<!--铃铛通知-->
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ dc88ffd1
......@@ -1047,9 +1047,9 @@
$scope.dateFormat = $translate.instant('dateFormat4Year');
}
if ($scope.serviceTypeId === enums.serviceType.VAT) {
$scope.systemTitle = $translate.instant('增值税申报');
$scope.systemTitle = $translate.instant('MenuVAT');
$scope.viewMode = 1;
$scope.dateFormat = $translate.instant(' yyyy 年 mm 月');
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
}
if ($scope.serviceTypeId === enums.serviceType.AssetsManage) {
$scope.systemTitle = $translate.instant('AssetTitle');
......
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