Skip to content

T
traffic-front
Commit b9f36bc9 authored by Ken you's avatar Ken you
Browse files
Options

show cit web menu ---Ken

parent 135f46f1
Show whitespace changes
Inline Side-by-side
Showing with 305 additions and 110 deletions
atms-web/src/main/webapp/Gruntfile.js
View file @ b9f36bc9
......@@ -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 @ b9f36bc9
......@@ -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/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ b9f36bc9
......@@ -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 @ b9f36bc9
......@@ -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/utils/constant.js
View file @ b9f36bc9
......@@ -538,10 +538,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',
}
},
};
// 权限代码
......@@ -680,6 +777,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 @ b9f36bc9
......@@ -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/vatImportService.js
View file @ b9f36bc9
......@@ -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/vat/vat-layout/vat-layout.ctrl.js
View file @ b9f36bc9
......@@ -156,106 +156,106 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
$scope.$root.checkUserOrganizationPermissionList(menuList).success(function (data) {
if (data) {
// if (data[constant.vatPermission.dataImport.balanceSheet.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1,
// permission: constant.vatPermission.dataImport.balanceSheet.queryCode, url: '#/vat/importData/balanceSheet'
// });
// }
// else if (data[constant.vatPermission.dataImport.journalEntry.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1,
// permission: constant.vatPermission.dataImport.journalEntry.queryCode, url: '#/vat/importData/journalEntry'
// });
// }
// else if (data[constant.vatPermission.dataImport.erpImport.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.erpData', state: 'importData.erpData', num: 1,
// permission: constant.vatPermission.dataImport.erpImport.queryCode, url: '#/vat/importData/erpData'
// });
// }
// else if (data[constant.vatPermission.dataImport.outputInvoice.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.outputInvoice', state: 'importData.outputInvoice', num: 1,
// permission: constant.vatPermission.dataImport.outputInvoice.queryCode, url: '#/vat/importData/outputInvoice'
// });
// }
// else if (data[constant.vatPermission.dataImport.inputInvoice.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.inputInvoice', state: 'importData.inputInvoice', num: 1,
// permission: constant.vatPermission.dataImport.inputInvoice.queryCode, url: '#/vat/importData/inputInvoice'
// });
// }
// else if (data[constant.vatPermission.dataImport.customInvoice.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.customInvoice', state: 'importData.customInvoice', num: 1,
// permission: constant.vatPermission.dataImport.customInvoice.queryCode, url: '#/vat/importData/customInvoice'
// });
// }
// else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.voucherMapping', state: 'importData.voucherMapping', num: 1,
// permission: constant.vatPermission.dataImport.voucherMapping.queryCode, url: '#/vat/importData/voucherMapping'
// });
// }
// else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.invoiceMapping', state: 'importData.invoiceMapping', num: 1,
// permission: constant.vatPermission.dataImport.invoiceMapping.queryCode, url: '#/vat/importData/invoiceMapping'
// });
// }
// else if (data[constant.vatPermission.dataImport.auditAdjust.queryCode]) {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1,
// permission: constant.vatPermission.dataImport.auditAdjust.queryCode, url: '#/vat/importData/auditAdjust'
// });
// }
//else {
// $scope.menus.push({
// name: 'importData', state: 'importData', num: 1,
// permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
// });
// subMenus.push({
// name: 'importData.productItem', state: 'importData.productItem', num: 1,
// permission: '02', url: '#/vat/importData/productItem'
// });
//}
if (data[constant.vatPermission.dataImport.balanceSheet.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.balanceSheet', state: 'importData.balanceSheet', num: 1,
permission: constant.vatPermission.dataImport.balanceSheet.queryCode, url: '#/vat/importData/balanceSheet'
});
}
else if (data[constant.vatPermission.dataImport.journalEntry.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.journalEntry', state: 'importData.journalEntry', num: 1,
permission: constant.vatPermission.dataImport.journalEntry.queryCode, url: '#/vat/importData/journalEntry'
});
}
else if (data[constant.vatPermission.dataImport.erpImport.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.erpData', state: 'importData.erpData', num: 1,
permission: constant.vatPermission.dataImport.erpImport.queryCode, url: '#/vat/importData/erpData'
});
}
else if (data[constant.vatPermission.dataImport.outputInvoice.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.outputInvoice', state: 'importData.outputInvoice', num: 1,
permission: constant.vatPermission.dataImport.outputInvoice.queryCode, url: '#/vat/importData/outputInvoice'
});
}
else if (data[constant.vatPermission.dataImport.inputInvoice.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.inputInvoice', state: 'importData.inputInvoice', num: 1,
permission: constant.vatPermission.dataImport.inputInvoice.queryCode, url: '#/vat/importData/inputInvoice'
});
}
else if (data[constant.vatPermission.dataImport.customInvoice.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.customInvoice', state: 'importData.customInvoice', num: 1,
permission: constant.vatPermission.dataImport.customInvoice.queryCode, url: '#/vat/importData/customInvoice'
});
}
else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.voucherMapping', state: 'importData.voucherMapping', num: 1,
permission: constant.vatPermission.dataImport.voucherMapping.queryCode, url: '#/vat/importData/voucherMapping'
});
}
else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.invoiceMapping', state: 'importData.invoiceMapping', num: 1,
permission: constant.vatPermission.dataImport.invoiceMapping.queryCode, url: '#/vat/importData/invoiceMapping'
});
}
else if (data[constant.vatPermission.dataImport.auditAdjust.queryCode]) {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.auditAdjust', state: 'importData.auditAdjust', num: 1,
permission: constant.vatPermission.dataImport.auditAdjust.queryCode, url: '#/vat/importData/auditAdjust'
});
}
else {
$scope.menus.push({
name: 'importData', state: 'importData', num: 1,
permission: constant.vatPermission.dataImport.dataImportCode, url: '#/vat/importData'
});
subMenus.push({
name: 'importData.productItem', state: 'importData.productItem', num: 1,
permission: '02', url: '#/vat/importData/productItem'
});
}
if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$scope.menus.push({
......
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