Commit 128e337d authored by zhkwei's avatar zhkwei

1、总分机构分配比例;2、发票记录导出模板;

parent a6abc899
......@@ -85,7 +85,7 @@ public class CitReportController {
try{
apiResultDto.setCode(1);
apiResultDto.setMessage("生成成功");
apiResultDto.setData(citReportService.generateTotalBranchOrgDisTable(citDistributionDto.getProjectId()));
apiResultDto.setData(citReportService.geneTotalBranchOrgDT(citDistributionDto.getProjectId()));
return apiResultDto;
}catch(Exception e){
e.printStackTrace();
......
......@@ -180,11 +180,15 @@
$scope.startCalculateData = function () {
citReportService.generateDistributionTable($scope.queryParams).success(function (data) {
$scope.totalBusinessIncome = data.data.totalBusinessIncome;
$scope.totalEmployeeRemuneration = data.data.totalEmployeeRemuneration;
$scope.totalTotalAssets = data.data.totalTotalAssets;
loadJournalEntryDataFromDB();
if (data.code != 0) {
$scope.totalBusinessIncome = data.data.totalBusinessIncome;
$scope.totalEmployeeRemuneration = data.data.totalEmployeeRemuneration;
$scope.totalTotalAssets = data.data.totalTotalAssets;
loadJournalEntryDataFromDB();
SweetAlert.success($translate.instant('ImportSuccess'))
} else {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
}
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
// return;
......@@ -264,7 +268,7 @@
{
caption: $translate.instant('DistributionRatio'),
dataField: "distributionRatio",
format: {type: 'fixedPoint', precision: 2},
format: {type: 'percent', precision: 2},
width: 200
}
],
......
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