Commit 804e0d9f authored by zhkwei's avatar zhkwei

CIT去掉页面debugger

parent 2094346e
......@@ -54,7 +54,7 @@
//获取固定资产二级分类的数据
var getAllFixedAssetDetailGroup = function(assetGroupType){
debugger;
var pageIndex = 1;
var pageSize = 10;
if(assetGroupType == '1'){
......@@ -68,7 +68,7 @@
pageSize = $scope.intangibleAssetsPagingOptions.pageSize;
}
assetGroupService.getAllFixedAssetDetailGroup(assetGroupType,pageIndex,pageSize).success(function(fixedAssetData){
debugger;
if(assetGroupType == '1'){
$scope.fixedAssetData = fixedAssetData.data['detailGroup'].list;
initFixedAssetPagingControl(fixedAssetData.data['totalItem']);
......@@ -81,42 +81,42 @@
}
}).error(function(){
debugger;
SweetAlert.error("获取类型为"+assetGroupType+"的资产数据出错");
});
};
//获取资产二级分类的数据
var getAllAssetDetailGroup = function(){
debugger;
assetGroupService.getAllAssetDetailGroup().success(function(resultData){
debugger;
$scope.fixedAssetData = resultData.data['1'];//1代表固定资产,获取返回数据map的key
$scope.longTermPendingData = resultData.data['2'];//2代表固定资产,获取返回数据map的key
$scope.intangibleAssetsData = resultData.data['3'];//3代表固定资产,获取返回数据map的key
}).error(function(){
debugger;
SweetAlert.error("获取资产数据出错");
});
};
$scope.pagingService = {
refreshFixedAssetDataGrid: function (assetGroupType) {
debugger;
$log.debug("refreshFixedAssetGrid");
getAllFixedAssetDetailGroup(assetGroupType);
}
};
var initFixedAssetPagingControl = function (totalItemsCount) {
debugger;
$scope.fixedAssetPagingOptions.totalItems = totalItemsCount;
};
var initLongTermPagingControl = function (totalItemsCount) {
debugger;
$scope.longTermPendingPagingOptions.totalItems = totalItemsCount;
};
var initIntangibleAssetsPagingControl = function (totalItemsCount) {
debugger;
$scope.intangibleAssetsPagingOptions.totalItems = totalItemsCount;
};
......@@ -129,7 +129,7 @@
};
//创建--固定资产
$scope.createNewData = function (type) {
debugger;
$scope.isEdit = false;
$scope.assetGroupType = type;
$scope.resetFixedAssetsObject();
......@@ -162,7 +162,7 @@
//给fixedAssetsObject实体赋予属性assetGroupType并赋值
$scope.fixedAssetsObject.assetGroupType = $scope.assetGroupType;
if($scope.isEdit){
debugger;
assetGroupService.updateAssetDetailGroup($scope.fixedAssetsObject).success(function () {
$(editModalSelector).modal('hide');
getAllFixedAssetDetailGroup($scope.assetGroupType);
......@@ -170,9 +170,9 @@
});
}else{
debugger;
assetGroupService.addAssetDetailGroup($scope.fixedAssetsObject).success(function () {
debugger;
if ($scope.fixedAssetsObject.groupYear)
$scope.fixedAssetsObject.groupYear = $scope.fixedAssetsObject.groupYear + "年";
// $scope.fixedAssetData.push($scope.fixedAssetsObject);
......@@ -190,7 +190,7 @@
};
//删除
$scope.delete = function (data) {
debugger;
assetGroupService.deleteAssetDetailGroup(data.id).success(function(){
getAllFixedAssetDetailGroup(data.assetGroupType);
// var index = $scope.fixedAssetData.indexOf(data);
......@@ -203,7 +203,7 @@
};
$scope.editRow = function (data,type) {
debugger;
$scope.assetGroupType = type;
$scope.isEdit = true;
$scope.fixedAssetsObject = angular.copy(data)
......
......@@ -263,7 +263,7 @@
if (resp.result) {
SweetAlert.success($translate.instant('ProcessSuccess'));
}else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......
......@@ -51,7 +51,7 @@
$scope.getDataFromDatabase = function (queryParams){
citReportService.getAssetEamMappings(queryParams).success(function (resp) {
debugger;
if (resp.data) {
// minDate = data.
var index = 1;
......@@ -247,7 +247,7 @@
$scope.startCalculateData = function () {
citReportService.generateAssetEamMapping($scope.queryParams).success(function (data) {
debugger;
loadJournalEntryDataFromDB(1);
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
......
......@@ -62,7 +62,7 @@
$scope.getDataFromDatabase = function (queryParams){
citReportService.getDistributionTables(queryParams).success(function (resp) {
debugger;
if (resp.data) {
// minDate = data.
var index = 1;
......@@ -258,7 +258,7 @@
$scope.startCalculateData = function () {
citReportService.generateDistributionTable($scope.queryParams).success(function (data) {
debugger;
$scope.totalBusinessIncome = data.data.totalBusinessIncome;
$scope.totalEmployeeRemuneration = data.data.totalEmployeeRemuneration;
$scope.totalTotalAssets = data.data.totalTotalAssets;
......
......@@ -957,7 +957,7 @@
//批量导出EXCEL
$scope.export = function () {
debugger;
var grp = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'TaxReturnType';
});
......@@ -992,13 +992,13 @@
var reg = /^([A-Z]+[0-9]+){1}$|^([A-Z]+[0-9]+){1}([\+-]{1}[A-Z]+[0-9]+)+$/g;
var exportReportData = [];
angular.forEach(reportArray, function (currentVal) {
debugger;
var node = _.first(_.where(grp.children, {reportId: currentVal}));
if (!node) {
return;
}
var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
debugger;
if (reportData && reportData.data && reportData.data.cellData) {
_.each(reportData.data.cellData, function (x) {
......
......@@ -103,7 +103,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -215,7 +215,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -300,7 +300,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -447,7 +447,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -478,7 +478,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -100,7 +100,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -208,7 +208,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -293,7 +293,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.DraftAccountMapping).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -386,7 +386,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.DraftAccountMapping).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -417,7 +417,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -100,7 +100,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -207,7 +207,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -292,7 +292,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.EAMAssetsDisposal).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -385,7 +385,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.EAMAssetsDisposal).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -416,7 +416,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -105,7 +105,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -173,16 +173,16 @@
withCredentials: true
}).then(function(data) {
var resp = data.data;
debugger;
$('#busy-indicator-container').hide();
deferred.resolve();
if (resp.result) {
debugger;
logDto.UpdateState = $translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData'));
} else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......@@ -223,7 +223,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -308,7 +308,7 @@ debugger;
};
var getImportLog = function () {
debugger;
var a = constant.citImportFileType.JournalAdjust;
citImportDataService.getCitDataImportLog(constant.citImportFileType.JournalAdjust).success(function (data) {
if (data) {
......@@ -456,7 +456,7 @@ debugger;
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.JournalAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -487,7 +487,7 @@ debugger;
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -103,7 +103,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -216,7 +216,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -301,7 +301,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.ProfitPrcAdjust).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -448,7 +448,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.ProfitPrcAdjust).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -479,7 +479,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -104,7 +104,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -177,7 +177,7 @@
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData'));
} else {
debugger;
if (resp.resultMsg && resp.resultMsg.length > 0) {
SweetAlert.warning(resp.resultMsg);
}else{
......@@ -218,7 +218,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -303,7 +303,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.SalaryAdvance).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -450,7 +450,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.SalaryAdvance).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -481,7 +481,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -106,7 +106,7 @@
//导入事件
var importFile = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......@@ -218,7 +218,7 @@
};
var loadImportInfoDataGrid = function () {
debugger;
$scope.importPLStatusGridOptions = {
bindingOptions: {
dataSource: 'citImportLogGridSource'
......@@ -303,7 +303,7 @@
};
var getImportLog = function () {
debugger;
citImportDataService.getCitDataImportLog(constant.citImportFileType.TrialBalance).success(function (data) {
if (data) {
$scope.citImportLogGridSource = data.data;
......@@ -450,7 +450,7 @@
};
$scope.downloadTemplate = function () {
debugger;
templateService.citDownloadTemplate(constant.citImportFileType.TrialBalance).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
......@@ -481,7 +481,7 @@
//开始
(function initialize() {
debugger;
$log.debug('ImportTBController.ctor()...');
checkUserOrganizationPermissionList();
$scope.importFile = importFile;
......
......@@ -3,23 +3,23 @@ webservices.factory('assetGroupService', ['$http', 'apiConfig', function ($http,
'use strict';
return {
getAllAssetDetailGroup: function () {
debugger;
return $http.get('/asset/getAllAssetDetailGroup', apiConfig.create());
},
getAllFixedAssetDetailGroup: function (assetGroupType,pageIndex,pageSize) {
debugger;
return $http.post('/asset/getFixedAssetDetailGroup',{"assetGroupType":assetGroupType,"pageIndex":pageIndex,"pageSize":pageSize}, apiConfig.create());
},
addAssetDetailGroup:function (assetDetailGroupDto) {
debugger;
return $http.post('/asset/addAssetDetailGroup',assetDetailGroupDto, apiConfig.create());
},
updateAssetDetailGroup:function (assetDetailGroupDto) {
debugger;
return $http.post('/asset/editAssetDetailGroup', assetDetailGroupDto, apiConfig.create());
},
deleteAssetDetailGroup:function (id) {
debugger;
return $http.delete('/asset/deleteAssetDetailGroup?id=' + id, apiConfig.create());
}
......
......@@ -215,7 +215,7 @@
生成固定资产及EAM对应的数据
*/
generateAssetEamMapping : function(citAssetsListDto){
debugger;
return $http.post('/citReport/generateAssetEamMapping', citAssetsListDto, apiConfig.create());
},
/**
......@@ -242,7 +242,7 @@
生成所得税分配表的
*/
generateDistributionTable : function(citAssetsListDto){
debugger;
return $http.post('/citReport/generateDistributionTable', citAssetsListDto, apiConfig.create());
},
/**
......
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