Skip to content

T
traffic-front
Commit 281e5c4d authored by zhkwei's avatar zhkwei
Browse files
Options

CIT--fixbug

parent d06e561c
Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 169 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateController.java
View file @ 281e5c4d
......@@ -90,6 +90,9 @@ public class TemplateController extends BaseController {
Sheet sheet = workbook.getSheetAt(i);
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
if(row == null){
continue;
}
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
if(c < 0){
continue;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 281e5c4d
......@@ -1277,6 +1277,7 @@ public class CitImportExcelServiceImpl extends BaseService {
beanUtil.copyProperties(trialBalance,citTbam);
citTbam.setId(idService.nextId());
citTbam.setAttribute(daMapping.getAttribute());
citTbam.setAccountDescription(citJournal.getSubjectName());
citTbamList.add(citTbam);
}
// citDraftAccountMappings.stream().forEach(daMapping -> {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 281e5c4d
......@@ -370,6 +370,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
Sheet temp = wtemp.getSheetAt(0);
for(int j = temp.getFirstRowNum(); j < temp.getLastRowNum(); j ++){
Row row = temp.getRow(j);
if(row == null){
continue;
}
for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){
Cell cell = row.getCell(k);
if (cell == null) {
......@@ -405,6 +408,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
List<PeriodDataSource> periodDataSourceList = Lists.newArrayList();
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
if(row == null){
continue;
}
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
if(c<0){
continue;
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ 281e5c4d
......@@ -34,8 +34,10 @@
"AssetGroupName": "Asset GroupName",
"AssetGroupNameValidation": "Pleas Enter Asset GroupName",
"AssetDescription": "Asset Description",
"AssetName": "Asset Name",
"BuyDate": "Buy Date",
"DepreciationDate": "Depreciation Start Date",
"DepreciationDate2": "Depreciation Date",
"DepreciationPeriod": "Depreciation Period",
"AcquisitionValue": "Acquisition Value",
"TotalAccountAcquisitionValue": "Total Account Acquisition Value:",
......@@ -45,6 +47,7 @@
"AdjustmentValue": "Adjustment Value",
"DisposedDate": "Disposed Date",
"ResidualRate": "Residual Rate",
"ResidualValue": "Residual Value",
"TaxMonthDepreciationAmount": "Monthly Depreciation Amount(Tax)",
"TaxToCurrentYearDepreciationAmount": "Up To Current Year Depreciation Amount(Tax)",
"ReportExportConfirm": "The Report Data Has not Been Saved, and the Operation Result May be Inconsistent With the Actual.Confirm to perform this operation?？",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 281e5c4d
......@@ -34,8 +34,10 @@
"AssetGroupName": "资产类别",
"AssetGroupNameValidation": "请输入资产类别",
"AssetDescription": "资产描述",
"AssetName": "资产名称",
"BuyDate": "购入日期",
"DepreciationDate": "开始折旧日期",
"DepreciationDate2": "报废日期",
"DepreciationPeriod": "折旧期限",
"AcquisitionValue": "原值",
"TotalAccountAcquisitionValue": "资产原值：",
......@@ -45,6 +47,7 @@
"AdjustmentValue": "原值调整值",
"DisposedDate": "报废日期",
"ResidualRate": "残值率",
"ResidualValue": "残值",
"TaxMonthDepreciationAmount": "每月折旧额(税务)",
"TaxToCurrentYearDepreciationAmount": "截止本年累计折旧额(税务)",
"ReportExportConfirm": "报表数据还未保存，操作结果可能和实际不一致，确定要执行这个操作吗？",
......
atms-web/src/main/webapp/app/cit/cit-layout/cit-layout.ctrl.js
View file @ 281e5c4d

citModule.controller('citLayoutController', ['$scope', '$rootScope', '$location', '$q', '$log', '$timeout', '$state', '$translate', 'projectService', 'SweetAlert',
'loginContext', 'citSessionService', 'vatSessionService', 'vatCommonService', 'vatWorkflowService', 'application', 'enums', '$uibModal',
function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate, projectService, SweetAlert, loginContext, citSessionService, vatSessionService,
function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate, projectService, SweetAlert, loginContext, citSessionService, vatSessionService,
vatCommonService, vatWorkflowService, application, enums, $uibModal) {
'use strict';
$log.debug('citLayoutController.ctor()...');
......@@ -81,8 +81,7 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
citSessionService.year = tempYear;
vatSessionService.year = tempYear;
$scope.projectName = vatSessionService.project.organizationName + '(' + vatSessionService.project.year + ')';
}
else {
} else {
SweetAlert.warning($translate.instant('NoProjet'));
// $location.path('/summary');
return;
......@@ -97,13 +96,11 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
if (or.result) {
vatSessionService.updateObjectProperty('project', 'projectStatusList.' + temp, constant.ProjectStatusEnum.UnStarted);
initStatus(vatSessionService.project.dbName, vatSessionService.project.id, temp);
}
else {
} else {
SweetAlert.error($translate.instant('SetProjectStatusError'));
}
});
}
else { //已经导入的话，更新最新项目状态
} else { //已经导入的话，更新最新项目状态
vatSessionService.updateObjectProperty('project', 'projectStatusList.' + temp, or.data.status);
initStatus(vatSessionService.project.dbName, vatSessionService.project.id, temp);
}
......@@ -115,9 +112,8 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
$scope.selectedDate = new Date(citSessionService.year, 0, 1);
//查看报表时路由为三层结构，特殊处理,其他逻辑不变
if ($state.$current.parent && $state.$current.parent.self.name === 'cit.generateReport') {
$scope.$broadcast('refreshCitGenerateReport', { templateId: $state.params.templateid });
}
else {
$scope.$broadcast('refreshCitGenerateReport', {templateId: $state.params.templateid});
} else {
$state.reload($state.$current);
}
}, 100);
......@@ -138,64 +134,69 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
$scope.$root.checkUserOrganizationPermissionList(menuList).success(function (data) {
if (data) {
if (data[constant.citPermission.dataImport.balanceSheet.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1,
permission: constant.citPermission.dataImport.balanceSheet.queryCode, url: '#/cit/importData/balanceSheet'
});
}
else if (data[constant.citPermission.dataImport.journalEntry.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1,
permission: constant.citPermission.dataImport.journalEntry.queryCode, url: '#/cit/importData/journalEntry'
});
}
else if (data[constant.citPermission.dataImport.erpImport.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.erpData', state: 'importData.erpData', num: 1,
permission: constant.citPermission.dataImport.erpImport.queryCode, url: '#/cit/importData/erpData'
});
}
else if (data[constant.citPermission.dataImport.auditAdjust.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1,
permission: constant.citPermission.dataImport.auditAdjust.queryCode, url: '#/cit/importData/auditAdjust'
});
}
else if (data[constant.citPermission.dataImport.documentList.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.documentList', state: 'importData.documentList', num: 1,
permission: constant.citPermission.dataImport.documentList.queryCode, url: '#/cit/importData/documentList'
});
}
else if (data[constant.citPermission.dataImport.assetList.queryCode]) {
// if (data[constant.citPermission.dataImport.balanceSheet.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
// });
// subMenus.push({
// name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1,
// permission: constant.citPermission.dataImport.balanceSheet.queryCode, url: '#/cit/importData/balanceSheet'
// });
// }
// else if (data[constant.citPermission.dataImport.journalEntry.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
// });
// subMenus.push({
// name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1,
// permission: constant.citPermission.dataImport.journalEntry.queryCode, url: '#/cit/importData/journalEntry'
// });
// }
// else if (data[constant.citPermission.dataImport.erpImport.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
// });
// subMenus.push({
// name: 'importData.erpData', state: 'importData.erpData', num: 1,
// permission: constant.citPermission.dataImport.erpImport.queryCode, url: '#/cit/importData/erpData'
// });
// }
// else if (data[constant.citPermission.dataImport.auditAdjust.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
// });
// subMenus.push({
// name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1,
// permission: constant.citPermission.dataImport.auditAdjust.queryCode, url: '#/cit/importData/auditAdjust'
// });
// }
// else if (data[constant.citPermission.dataImport.documentList.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
// });
// subMenus.push({
// name: 'importData.documentList', state: 'importData.documentList', num: 1,
// permission: constant.citPermission.dataImport.documentList.queryCode, url: '#/cit/importData/documentList'
// });
// }
// else
if (data[constant.citPermission.dataImport.assetList.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.citPermission.dataImport.dataImportCode, url: '#/cit/importData'
});
subMenus.push({
name: 'importData.assetList', state: 'importData.assetList', num: 1,
permission: constant.citPermission.dataImport.assetList.queryCode, url: '#/cit/importData/assetList'
name: 'importData.assetList',
state: 'importData.assetList',
num: 1,
permission: constant.citPermission.dataImport.assetList.queryCode,
url: '#/cit/importData/assetList'
});
}
//有万能导入数据菜单
......@@ -238,58 +239,71 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.journalMerge', state: 'previewData.journalMerge', num: 2,
permission: constant.citPermission.dataPreview.journalMerge.queryCode, url: '#/cit/previewData/journalMerge'
name: 'previewData.journalMerge',
state: 'previewData.journalMerge',
num: 2,
permission: constant.citPermission.dataPreview.journalMerge.queryCode,
url: '#/cit/previewData/journalMerge'
});
}
else if (data[constant.citPermission.dataPreview.bsGenerateVer.queryCode]) {
} else if (data[constant.citPermission.dataPreview.bsGenerateVer.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.bsGenerateVer', state: 'previewData.bsGenerateVer', num: 2,
permission: constant.citPermission.dataPreview.bsGenerateVer.queryCode, url: '#/cit/previewData/bsGenerateVer'
name: 'previewData.bsGenerateVer',
state: 'previewData.bsGenerateVer',
num: 2,
permission: constant.citPermission.dataPreview.bsGenerateVer.queryCode,
url: '#/cit/previewData/bsGenerateVer'
});
}
else if (data[constant.citPermission.dataPreview.bsMappingVer.queryCode]) {
} else if (data[constant.citPermission.dataPreview.bsMappingVer.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.bsMappingVer', state: 'previewData.bsMappingVer', num: 2,
permission: constant.citPermission.dataPreview.bsMappingVer.queryCode, url: '#/cit/previewData/bsMappingVer'
name: 'previewData.bsMappingVer',
state: 'previewData.bsMappingVer',
num: 2,
permission: constant.citPermission.dataPreview.bsMappingVer.queryCode,
url: '#/cit/previewData/bsMappingVer'
});
}
else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
} else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.assetsList', state: 'previewData.assetsList', num: 2,
permission: constant.citPermission.dataPreview.assetsList.queryCode, url: '#/cit/previewData/assetsList'
name: 'previewData.assetsList',
state: 'previewData.assetsList',
num: 2,
permission: constant.citPermission.dataPreview.assetsList.queryCode,
url: '#/cit/previewData/assetsList'
});
}
else if (data[constant.citPermission.dataPreview.salaryAdvance.queryCode]) {
} else if (data[constant.citPermission.dataPreview.salaryAdvance.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.salaryAdvance', state: 'previewData.salaryAdvance', num: 2,
permission: constant.citPermission.dataPreview.salaryAdvance.queryCode, url: '#/cit/previewData/salaryAdvance'
name: 'previewData.salaryAdvance',
state: 'previewData.salaryAdvance',
num: 2,
permission: constant.citPermission.dataPreview.salaryAdvance.queryCode,
url: '#/cit/previewData/salaryAdvance'
});
}
else if (data[constant.citPermission.dataPreview.eamDisposal.queryCode]) {
} else if (data[constant.citPermission.dataPreview.eamDisposal.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.eamDisposal', state: 'previewData.eamDisposal', num: 2,
permission: constant.citPermission.dataPreview.eamDisposal.queryCode, url: '#/cit/previewData/eamDisposal'
name: 'previewData.eamDisposal',
state: 'previewData.eamDisposal',
num: 2,
permission: constant.citPermission.dataPreview.eamDisposal.queryCode,
url: '#/cit/previewData/eamDisposal'
});
}
......@@ -299,28 +313,35 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
permission: constant.citPermission.dataManage.dataManageCode, url: '#/cit/reductionData'
});
subMenus.push({
name: 'reductionData.caculateData', state: 'reductionData.caculateData', num: 3,
permission: constant.citPermission.dataManage.caculateDataCode, url: '#/cit/reductionData/caculateData'
name: 'reductionData.caculateData',
state: 'reductionData.caculateData',
num: 3,
permission: constant.citPermission.dataManage.caculateDataCode,
url: '#/cit/reductionData/caculateData'
});
}
else if (data[constant.citPermission.dataManage.accountMappingCode]) {
} else if (data[constant.citPermission.dataManage.accountMappingCode]) {
$scope.menus.push({
name: 'reductionData', state: 'reductionData', num: 3,
permission: constant.citPermission.dataManage.dataManageCode, url: '#/cit/reductionData'
});
subMenus.push({
name: 'reductionData.accountMapping', state: 'reductionData.accountMapping', num: 3,
permission: constant.citPermission.dataManage.accountMappingCode, url: '#/cit/reductionData/accountMapping'
name: 'reductionData.accountMapping',
state: 'reductionData.accountMapping',
num: 3,
permission: constant.citPermission.dataManage.accountMappingCode,
url: '#/cit/reductionData/accountMapping'
});
}
else if (data[constant.citPermission.dataManage.assetEamMapping]) {
} else if (data[constant.citPermission.dataManage.assetEamMapping]) {
$scope.menus.push({
name: 'reductionData', state: 'reductionData', num: 3,
permission: constant.citPermission.dataManage.dataManageCode, url: '#/cit/reductionData'
});
subMenus.push({
name: 'reductionData.assetEamMapping', state: 'reductionData.assetEamMapping', num: 3,
permission: constant.citPermission.dataManage.assetEamMapping, url: '#/cit/reductionData/assetEamMapping'
name: 'reductionData.assetEamMapping',
state: 'reductionData.assetEamMapping',
num: 3,
permission: constant.citPermission.dataManage.assetEamMapping,
url: '#/cit/reductionData/assetEamMapping'
});
}
......@@ -450,15 +471,51 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
function setSubStatusDto() {
$log.debug("setSubStatusDto");
$scope.subStatusList = [];
var tbStatus = { dispalyIndex: 1, name: $translate.instant('balanceSheet'), isImported: vatSessionService.project.importSubStatus.isTbImport };
var entryStatus = { dispalyIndex: 2, name: $translate.instant('JournalEntryTitle'), isImported: vatSessionService.project.importSubStatus.isEntryImport };
var erpStatus = { dispalyIndex: 3, name: $translate.instant('erpData'), isImported: vatSessionService.project.importSubStatus.isErpImport };
var outputInvoiceStatus = { dispalyIndex: 4, name: $translate.instant('outputInvoice'), isImported: vatSessionService.project.importSubStatus.isOutputInvoiceImport };
var inputInvoiceStatus = { dispalyIndex: 5, name: $translate.instant('inputInvoice'), isImported: vatSessionService.project.importSubStatus.isInputInvoiceImport };
var customStatus = { dispalyIndex: 6, name: $translate.instant('customInvoice'), isImported: vatSessionService.project.importSubStatus.isCustomInvoiceImport };
var voucherMapStatus = { dispalyIndex: 7, name: $translate.instant('voucherMapping'), isImported: vatSessionService.project.importSubStatus.isVoucherMapImport };
var invoiceMapStatus = { dispalyIndex: 8, name: $translate.instant('invoiceMapping'), isImported: vatSessionService.project.importSubStatus.isInvoiceMapImport };
var adjustStatus = { dispalyIndex: 9, name: $translate.instant('auditAdjust'), isImported: vatSessionService.project.importSubStatus.isAdjustImport };
var tbStatus = {
dispalyIndex: 1,
name: $translate.instant('balanceSheet'),
isImported: vatSessionService.project.importSubStatus.isTbImport
};
var entryStatus = {
dispalyIndex: 2,
name: $translate.instant('JournalEntryTitle'),
isImported: vatSessionService.project.importSubStatus.isEntryImport
};
var erpStatus = {
dispalyIndex: 3,
name: $translate.instant('erpData'),
isImported: vatSessionService.project.importSubStatus.isErpImport
};
var outputInvoiceStatus = {
dispalyIndex: 4,
name: $translate.instant('outputInvoice'),
isImported: vatSessionService.project.importSubStatus.isOutputInvoiceImport
};
var inputInvoiceStatus = {
dispalyIndex: 5,
name: $translate.instant('inputInvoice'),
isImported: vatSessionService.project.importSubStatus.isInputInvoiceImport
};
var customStatus = {
dispalyIndex: 6,
name: $translate.instant('customInvoice'),
isImported: vatSessionService.project.importSubStatus.isCustomInvoiceImport
};
var voucherMapStatus = {
dispalyIndex: 7,
name: $translate.instant('voucherMapping'),
isImported: vatSessionService.project.importSubStatus.isVoucherMapImport
};
var invoiceMapStatus = {
dispalyIndex: 8,
name: $translate.instant('invoiceMapping'),
isImported: vatSessionService.project.importSubStatus.isInvoiceMapImport
};
var adjustStatus = {
dispalyIndex: 9,
name: $translate.instant('auditAdjust'),
isImported: vatSessionService.project.importSubStatus.isAdjustImport
};
$scope.subStatusList.push(tbStatus);
$scope.subStatusList.push(entryStatus);
......@@ -486,9 +543,9 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
return;
}
var viewReportNode = _.where(wf.workflowNodeList, { dictionaryKey: constant.DictionaryDictKey.ViewReport })[0];
var viewReportNode = _.where(wf.workflowNodeList, {dictionaryKey: constant.DictionaryDictKey.ViewReport})[0];
if (!_.isNull(viewReportNode) && !_.isUndefined(viewReportNode)) {
var submitTask = _.where(viewReportNode.workflowTaskList, { dictionaryKey: constant.DictionaryDictKey.WFSubmitReport })[0];
var submitTask = _.where(viewReportNode.workflowTaskList, {dictionaryKey: constant.DictionaryDictKey.WFSubmitReport})[0];
if (!_.isNull(submitTask) && !_.isUndefined(submitTask)) {
$scope.submitDetailDto.userId = submitTask.userId;
$scope.submitDetailDto.userName = submitTask.userName;
......@@ -507,8 +564,7 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
if (!_.isUndefined(curPeriodStatus)) {
if (_.isEqual(curPeriodStatus, constant.ProjectStatusEnum.UnStarted)) {
$scope.startStatusText = $translate.instant('ProjectStatusUnStarted');
}
else {
} else {
$scope.startStatusText = $translate.instant('ProjectStatusStarted');
}
}
......@@ -549,15 +605,17 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
});
if (state) {
if (state['state'] && state['state'].indexOf('importDataView') >= 0) {
$state.go('importDataView', { id: vatSessionService.tableInfoList[0].id, serviceType: enums.serviceType.CIT });
}
else {
$state.go('importDataView', {
id: vatSessionService.tableInfoList[0].id,
serviceType: enums.serviceType.CIT
});
} else {
$state.go('cit.' + state['state']);
}
}
else {
} else {
$state.go(toState);
};
}
;
}
}
......@@ -571,19 +629,21 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
citSessionService.dataChanged = false;
if (_.contains(mainMenu, toState.name)) {
goFirstSubMenu(toState);
}
else {
} else {
$state.go(toState, toParams, options);
};
};
});
}
else {
;
}
;
});
} else {
if (_.contains(mainMenu, toState.name)) {
event.preventDefault();
goFirstSubMenu(toState);
};
};
}
;
}
;
});
(function initialize() {
......@@ -599,4 +659,4 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
});
})();
}]);
\ No newline at end of file
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ 281e5c4d
......@@ -92,26 +92,26 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
$scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
$scope.linkShort = enums.linkShort.ImportData;
$scope.menus = [
{
name: 'balanceSheet', permission: constant.citPermission.dataImport.balanceSheet.queryCode,
text: $translate.instant('balanceSheet'), icon: 'fa fa-bank'
},
{
name: 'documentList', permission: constant.citPermission.dataImport.documentList.queryCode,
text: $translate.instant('documentList'), icon: 'fa fa-file-text-o'
},
{
name: 'journalEntry', permission: constant.citPermission.dataImport.journalEntry.queryCode,
text: $translate.instant('journalEntry'), icon: 'fa fa-align-left'
},
{
name: 'erpData', permission: constant.citPermission.dataImport.erpImport.queryCode,
text: $translate.instant('erpData'), icon: 'fa fa-list-ul'
},
{
name: 'auditAdjust', permission: constant.citPermission.dataImport.auditAdjust.queryCode,
text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust'
},
// {
// name: 'balanceSheet', permission: constant.citPermission.dataImport.balanceSheet.queryCode,
// text: $translate.instant('balanceSheet'), icon: 'fa fa-bank'
// },
// {
// name: 'documentList', permission: constant.citPermission.dataImport.documentList.queryCode,
// text: $translate.instant('documentList'), icon: 'fa fa-file-text-o'
// },
// {
// name: 'journalEntry', permission: constant.citPermission.dataImport.journalEntry.queryCode,
// text: $translate.instant('journalEntry'), icon: 'fa fa-align-left'
// },
// {
// name: 'erpData', permission: constant.citPermission.dataImport.erpImport.queryCode,
// text: $translate.instant('erpData'), icon: 'fa fa-list-ul'
// },
// {
// name: 'auditAdjust', permission: constant.citPermission.dataImport.auditAdjust.queryCode,
// text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust'
// },
{
name: 'assetList', permission: constant.citPermission.dataImport.assetList.queryCode,
text: $translate.instant('AssetList'), icon: 'fa fa-list-ul'
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ 281e5c4d
......@@ -312,7 +312,7 @@
{ name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
{ name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
{ name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
{ name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },
{ name: $translate.instant('BeginningBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.beginningBalance}}</span></div>' },
{ name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.endingBalance}}</span></div>' },
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js
View file @ 281e5c4d
......@@ -316,7 +316,7 @@
{ name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
{ name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
{ name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
{ name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },
{ name: $translate.instant('BeginningBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.beginningBalance}}</span></div>' },
{ name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.endingBalance}}</span></div>' },
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 281e5c4d
......@@ -284,12 +284,12 @@
columnDefs: [
{ name: $translate.instant('AssetType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetType}}<span></div>' },
{ name: $translate.instant('AssetNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetNumber}}<span></div>' },
{ name: $translate.instant('AssetDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
{ name: $translate.instant('AssetName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
{ name: $translate.instant('BuyDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.buyDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('DepreciationDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('DepreciationDate2'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('AssetGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetGroupName}}</span></div>' },
{ name: $translate.instant('AcquisitionValue'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.acquisitionValue}}</span></div>' },
{ name: $translate.instant('ResidualRate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.residualRate}}</span></div>' },
{ name: $translate.instant('ResidualValue'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.residualRate}}</span></div>' },
{ name: $translate.instant('YearEndValue'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.yearEndValue}}</span></div>' },
{ name: $translate.instant('CompensationSaleAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.compensationSaleAmount}}</span></div>' },
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ 281e5c4d
<div class="cit-asset-eam-mapping" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
<span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
......
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.html
View file @ 281e5c4d
......@@ -2,14 +2,14 @@
<!--Report SpreadJS-->
<div ng-if="!isDocumentList" class="row">
<span ng-if="!isBSPL" ng-click="openExportPop('export');"><i class="fa fa-download"></i>&nbsp;{{'ExportExcel' | translate}}</span>
<span ng-if="!isBSPL" ng-click="commitApprove();"><i
class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>
<span ng-if="!isBSPL" ng-click="doApprove();"><i
class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>
<span ng-if="!isBSPL" ng-click="upLoadManual();"><i
class="fa fa-floppy-o"></i>&nbsp;{{'上传手工数据'}}
</span>
<span ng-if="!isBSPL" ng-click="openExportPop('upload');"><i class="fa fa-upload"></i>&nbsp;{{'UploadExcel' | translate}}</span>
<!--<span ng-if="!isBSPL" ng-click="commitApprove();"><i-->
<!--class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>-->
<!--<span ng-if="!isBSPL" ng-click="doApprove();"><i-->
<!--class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>-->
<!--<span ng-if="!isBSPL" ng-click="upLoadManual();"><i-->
<!--class="fa fa-floppy-o"></i>&nbsp;{{'上传手工数据'}}-->
<!--</span>-->
<!--<span ng-if="!isBSPL" ng-click="openExportPop('upload');"><i class="fa fa-upload"></i>&nbsp;{{'UploadExcel' | translate}}</span>-->
<!--<span ng-if="!isBSPL" ng-click="saveReportCache();"><i-->
<!--class="fa fa-floppy-o"></i>&nbsp;{{'Save' | translate}}</span>-->
</div>
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 281e5c4d
......@@ -597,23 +597,23 @@ constant.citPermission = {
dataImportCode: '03.001',
balanceSheet: {
queryCode: '03.001.001',
importCode: '03.001.002'
// importCode: '03.001.002'
},
journalEntry: {
queryCode: '03.001.003',
importCode: '03.001.004'
// importCode: '03.001.004'
},
erpImport: {
queryCode: '03.001.005',
importCode: '03.001.006'
// importCode: '03.001.006'
},
auditAdjust: {
queryCode: '03.001.007',
importCode: '03.001.008'
// importCode: '03.001.008'
},
documentList: {
queryCode: '03.001.009',
importCode: '03.001.010'
// importCode: '03.001.010'
},
assetList: {
queryCode: '03.001.011',
......@@ -914,11 +914,11 @@ constant.analysisPermisson = {
};
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.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,
......
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