Skip to content

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

change form parameter to projectId

parent 68f30e0a
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
atms-web/src/main/webapp/app/framework/utils/webservice.js
View file @ 4895f6c9
......@@ -181,7 +181,7 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
else {
if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
cfg.headers = { 'from': vatSessionService.project.id + '@cn.pwc.com' };
}
}
return cfg;
......@@ -200,7 +200,7 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
cfg.headers = { 'from': vatSessionService.project.id + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
atms-web/src/main/webapp/bundles/framework.js
View file @ 4895f6c9
......@@ -1666,7 +1666,7 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
else if (project.serviceTypeID === enums.serviceType.VAT) {
if (project.haveCreateProject) {
if (_.isUndefined(project.projectStatusList[vatSessionService.month])) { //如果当前期间还没有导入任何数据的话，就添加一条未开始状态的记录
projectService.setProjectStatus( project.id,vatSessionService.month, constant.ProjectStatusEnum.UnStarted)
projectService.setProjectStatus(project.id, vatSessionService.month, constant.ProjectStatusEnum.UnStarted)
.success(function (or) {
if (or.result) {
//添加完成后，在vatSessionService.project中添加新加入的数据
......@@ -1694,7 +1694,7 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
projectService.getProjectAllStatus(project.id).success(function (org) {
//添加完成后，在vatSessionService.project中添加新加入的数据
project.projectStatusList = org;
projectService.getProjectStatus(project.id, vatSessionService.month)
projectService.getProjectStatus( project.id, vatSessionService.month)
.success(function (or1) {
if (or1.result) {
project.importSubStatus = or1.data.importSubStatus;
......@@ -1842,7 +1842,7 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
// $state.go('vat.importData.customInvoice');
// } else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) {
// $state.go('vat.importData.voucherMapping');
// } else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
// } else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {./
// $state.go('vat.importData.invoiceMapping');
// } else
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
......@@ -4530,7 +4530,7 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
else {
if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
cfg.headers = { 'from': vatSessionService.project.id + '@cn.pwc.com' };
}
}
return cfg;
......@@ -4549,7 +4549,7 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
cfg.headers = { 'from': vatSessionService.project.id + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
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