Skip to content

T
traffic-front
Commit 060ad42c authored by zhkwei's avatar zhkwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents 1b068d4c 1b34c887
Show whitespace changes
Inline Side-by-side
Showing with 270 additions and 115 deletions
atms-api/pom.xml
View file @ 060ad42c
...@@ -456,7 +456,6 @@ ...@@ -456,7 +456,6 @@
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>staging</id> <id>staging</id>
<build> <build>
...@@ -617,7 +616,7 @@ ...@@ -617,7 +616,7 @@
</dependencies> </dependencies>
</plugin> </plugin>
<!-- See: https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven --> <!-- See: https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven -->
<plugin> <plugin>ll
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
<version>3.4.0.905</version> <version>3.4.0.905</version>
......
atms-api/src/main/java/pwc/taxtech/atms/common/ThousandConvert.java
View file @ 060ad42c
...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; ...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
...@@ -19,11 +20,13 @@ import java.util.Locale; ...@@ -19,11 +20,13 @@ import java.util.Locale;
* version 1.0 * version 1.0
*/ */
public class ThousandConvert extends JsonSerializer<BigDecimal> { public class ThousandConvert extends JsonSerializer<BigDecimal> {
@Override @Override
public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2) public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2)
throws IOException { throws IOException {
jgen.writeString(NumberFormat.getIntegerInstance(Locale.getDefault()).format(value)); NumberFormat integerInstance = NumberFormat.getIntegerInstance(Locale.getDefault());
integerInstance.setMinimumFractionDigits(2);
integerInstance.setRoundingMode(RoundingMode.HALF_UP);
integerInstance.setGroupingUsed(true);
jgen.writeString(integerInstance.format(value));
} }
} }
atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisActualTaxReturnDto.java
View file @ 060ad42c
package pwc.taxtech.atms.dto.analysis; package pwc.taxtech.atms.dto.analysis;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -10,15 +13,19 @@ import java.math.BigDecimal; ...@@ -10,15 +13,19 @@ import java.math.BigDecimal;
public class AnalysisActualTaxReturnDto { public class AnalysisActualTaxReturnDto {
private String companyName; private String companyName;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment1; private BigDecimal segment1;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment2; private BigDecimal segment2;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment3; private BigDecimal segment3;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment4; private BigDecimal segment4;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment5; private BigDecimal segment5;
public String getCompanyName() { public String getCompanyName() {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisDriverNumDto.java
View file @ 060ad42c
package pwc.taxtech.atms.dto.analysis; package pwc.taxtech.atms.dto.analysis;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -11,6 +14,7 @@ public class AnalysisDriverNumDto { ...@@ -11,6 +14,7 @@ public class AnalysisDriverNumDto {
private String driverType; private String driverType;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal driverNum; private BigDecimal driverNum;
public String getDriverType() { public String getDriverType() {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/EbitDataDto.java
View file @ 060ad42c
package pwc.taxtech.atms.dto.vatdto; package pwc.taxtech.atms.dto.vatdto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -10,11 +13,16 @@ import java.math.BigDecimal; ...@@ -10,11 +13,16 @@ import java.math.BigDecimal;
* Version 1.0 * Version 1.0
**/ **/
public class EbitDataDto { public class EbitDataDto {
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal ebitSubtraction; // 1. EBIT（考虑资产减值损失） private BigDecimal ebitSubtraction; // 1. EBIT（考虑资产减值损失）
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal specialFactors; //考虑特殊因素 private BigDecimal specialFactors; //考虑特殊因素
private String ebitRate;// ebit比率 默认1%（可更改） private String ebitRate;// ebit比率 默认1%（可更改）
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal transactionAmount; //关联交易金额 private BigDecimal transactionAmount; //关联交易金额
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal sixAddTax; //6%增值税 private BigDecimal sixAddTax; //6%增值税
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal totalAmountTax;// 价税合计金额 private BigDecimal totalAmountTax;// 价税合计金额
private String specialConsiderations;//特殊因素考虑 private String specialConsiderations;//特殊因素考虑
public String getSpecialConsiderations() { public String getSpecialConsiderations() {
...@@ -26,8 +34,6 @@ public class EbitDataDto { ...@@ -26,8 +34,6 @@ public class EbitDataDto {
} }
public BigDecimal getEbitSubtraction() { public BigDecimal getEbitSubtraction() {
return ebitSubtraction; return ebitSubtraction;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 060ad42c
...@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.NumberFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
...@@ -1309,6 +1310,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -1309,6 +1310,7 @@ public class ReportServiceImpl extends BaseService {
CellDataDto cellDataDto = null; CellDataDto cellDataDto = null;
CellDataDto cellDataDto1 = null; CellDataDto cellDataDto1 = null;
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
if(i >=23) continue;//过滤掉多余数据
cellDataDto = new CellDataDto(); cellDataDto = new CellDataDto();
cellDataDto1 = new CellDataDto(); cellDataDto1 = new CellDataDto();
if (list.get(i).getItemName().equals("")) if (list.get(i).getItemName().equals(""))
...@@ -2520,38 +2522,6 @@ public class ReportServiceImpl extends BaseService { ...@@ -2520,38 +2522,6 @@ public class ReportServiceImpl extends BaseService {
} }
@Transactional
public void saveDatasource(String orgId, Integer period, Integer specialConsiderations, String ebitRate,
OperationResultDto<ReportDataDto> operationResultDto,
List<CellDataDto> cellDataList) {
EbitCellDataExample example = null;
List<EbitCellData> ebitCellDataList = new ArrayList<>();
for (int i = 37; i <= 43; i++) {
example = new EbitCellDataExample();
EbitCellDataExample.Criteria criteria = example.createCriteria();
criteria.andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period).andColEqualTo(1).andRowEqualTo(i);
List<EbitCellData> ebitCellData = ebitCellDataMapper.selectByExample(example);
if (ebitCellData.size() == 0) {
for (CellDataDto cellDataDto : cellDataList) {
EbitCellData ebitCellData1 = new EbitCellData();
ebitCellData1.setId(idService.nextId());
ebitCellData1.setOrganizationId(orgId);
ebitCellData1.setPeriod(period);
ebitCellData1.setCreateTime(new Date());
ebitCellData1.setCol(cellDataDto.getColumnIndex());
ebitCellData1.setRow(cellDataDto.getRowIndex());
ebitCellData1.setData(cellDataDto.getCellValue());
ebitCellDataList.add(ebitCellData1);
}
ebitCellDataList.add(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period));
ebitCellDataMapper.insertBatch(ebitCellDataList);
} else {
ebitCellDataMapper.updateByExampleSelective(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period), example);
}
}
}
private EbitCellData switchMeth(Integer i, EbitCellData ebitCellData1, OperationResultDto<ReportDataDto> operationResultDto, Integer specialConsiderations, String ebitRate, String orgId, Integer period) { private EbitCellData switchMeth(Integer i, EbitCellData ebitCellData1, OperationResultDto<ReportDataDto> operationResultDto, Integer specialConsiderations, String ebitRate, String orgId, Integer period) {
switch (i) { switch (i) {
case 37: case 37:
...@@ -2671,6 +2641,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2671,6 +2641,7 @@ public class ReportServiceImpl extends BaseService {
@Autowired @Autowired
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
private CellStyle cellStyle1 = null; private CellStyle cellStyle1 = null;
private static final String EBITTemplateCode = "VAT10086";
/** /**
* 批量导出Excel ebit利润表 * 批量导出Excel ebit利润表
...@@ -2685,7 +2656,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2685,7 +2656,7 @@ public class ReportServiceImpl extends BaseService {
File templateFile; File templateFile;
InputStream inputStream = null; InputStream inputStream = null;
TemplateExample templateExample = new TemplateExample(); TemplateExample templateExample = new TemplateExample();
templateExample.createCriteria().andCodeEqualTo("VAT10086").andNameEqualTo("VAT10086");//todo 这里是利润表模板的固定code，禁止重复 templateExample.createCriteria().andCodeEqualTo(EBITTemplateCode).andNameEqualTo(EBITTemplateCode);//todo 这里是利润表模板的固定code，禁止重复
List<Template> templates1 = templateMapper.selectByExample(templateExample); List<Template> templates1 = templateMapper.selectByExample(templateExample);
if (templates1.size() == 0) if (templates1.size() == 0)
throw new Exception("没有利润表模板,无法批量导出,请上传模板"); throw new Exception("没有利润表模板,无法批量导出,请上传模板");
...@@ -2885,7 +2856,9 @@ public class ReportServiceImpl extends BaseService { ...@@ -2885,7 +2856,9 @@ public class ReportServiceImpl extends BaseService {
sheetAt.getRow(row).getCell(col).setCellStyle(cellStyle1); sheetAt.getRow(row).getCell(col).setCellStyle(cellStyle1);
return sheetAt.getRow(row).getCell(col); return sheetAt.getRow(row).getCell(col);
} }
private static final String headerEbitTitle = "汇总利润表"; private static final String headerEbitTitle = "汇总利润表";
public void insertExcelOne(CellStyle headerCellType, XSSFWorkbook workbook1, Sheet sheetAt, Integer _index, RequestParameterDto requestParameterDto) { public void insertExcelOne(CellStyle headerCellType, XSSFWorkbook workbook1, Sheet sheetAt, Integer _index, RequestParameterDto requestParameterDto) {
headerCellType.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直 headerCellType.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直
headerCellType.setAlignment(HorizontalAlignment.CENTER);// 水平 headerCellType.setAlignment(HorizontalAlignment.CENTER);// 水平
...@@ -2949,7 +2922,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2949,7 +2922,7 @@ public class ReportServiceImpl extends BaseService {
//获取利润表模板Id 利润表固定模板VAT10086 //获取利润表模板Id 利润表固定模板VAT10086
public String getlxbId() throws Exception { public String getlxbId() throws Exception {
try { try {
String sql = "select * from template t where t.name = 'VAT10086' order by t.create_time desc "; String sql = "select * from template t where t.name = '" + EBITTemplateCode + "' order by t.create_time desc ";
Map<String, Object> stringObjectMap = new HashMap<>(); Map<String, Object> stringObjectMap = new HashMap<>();
stringObjectMap = jdbcTemplate.queryForList(sql).get(0); stringObjectMap = jdbcTemplate.queryForList(sql).get(0);
return stringObjectMap.get("id").toString(); return stringObjectMap.get("id").toString();
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisActualTaxReturn.java
View file @ 060ad42c
...@@ -3,6 +3,8 @@ package pwc.taxtech.atms.analysis.entity; ...@@ -3,6 +3,8 @@ package pwc.taxtech.atms.analysis.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.entity.BaseEntity; import pwc.taxtech.atms.entity.BaseEntity;
/** /**
......
atms-orangeheap/src/components/Panel.vue
View file @ 060ad42c
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<v-container ma-0 pa-0> <v-container ma-0 pa-0>
<Tableau :url="chartUrl" <Tableau :url="chartUrl"
width="100%" width="100%"
ref="tableau" ref="tableau"
:apiUrl="tableauApiUrl" :apiUrl="tableauApiUrl"
> >
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
{ {
iconName: '#d-iconyihuankuanbufen', iconName: '#d-iconyihuankuanbufen',
active: false, active: false,
title: '税种未返还税金分析', title: '税负分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax', chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
}, },
{ {
......
atms-orangeheap/src/views/ChartApp.vue
View file @ 060ad42c
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<v-bottom-nav <v-bottom-nav
:active.sync="bottomNav" :active.sync="bottomNav"
:value="true" :value="true"
color="#ffffff"
absolute absolute
style=" overflow: hidden; style=" overflow: hidden;
position: fixed; position: fixed;
...@@ -16,25 +17,25 @@ ...@@ -16,25 +17,25 @@
> >
<v-btn <v-btn
color="teal" color="#333333"
flat flat
value="panel" value="panel"
depressed depressed
:to="{name: 'panel'}" :to="{name: 'panel'}"
> >
<span style="font-size:20px ; color:#999999">仪表盘</span> <span style="font-size:20px ; ">仪表盘</span>
<v-icon color="#dddddd">table_chart</v-icon> <v-icon >table_chart</v-icon>
</v-btn> </v-btn>
<v-btn <v-btn
color="teal" color="#333333"
flat flat
value="mine" value="mine"
depressed depressed
:to="{name: 'mine'}" :to="{name: 'mine'}"
> >
<span style="font-size:20px ;color:#999999 " > 我的</span> <span style="font-size:20px ; " > 我的</span>
<v-icon color="#dddddd" >account_box</v-icon> <v-icon >account_box</v-icon>
</v-btn> </v-btn>
</v-bottom-nav> </v-bottom-nav>
......
atms-web/src/main/webapp/app/common/utils/pwc-util.js
View file @ 060ad42c
...@@ -1181,7 +1181,9 @@ ...@@ -1181,7 +1181,9 @@
/------------------------------------------------kevin insert -----------------------------------/ /------------------------------------------------kevin insert -----------------------------------/
PWC.downloadCallBack = function (data, status, headers, fileName) { PWC.downloadCallBack = function (data, status, headers, fileName) {
var octetStreamMime = 'application/octet-stream'; var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime; var contentType = octetStreamMime;
if (headers)
contentType = headers('content-type') || octetStreamMime;
if (window.navigator.msSaveBlob) { if (window.navigator.msSaveBlob) {
var blob = new Blob([data], { var blob = new Blob([data], {
type: contentType type: contentType
...@@ -1214,7 +1216,7 @@ ...@@ -1214,7 +1216,7 @@
scope.selectOrgOptions = { scope.selectOrgOptions = {
displayExpr: 'name', displayExpr: 'name',
valueExpr: 'id', valueExpr: 'id',
width: function() { width: function () {
return window.innerWidth / 4.5; return window.innerWidth / 4.5;
}, },
bindingOptions: { bindingOptions: {
...@@ -1227,10 +1229,10 @@ ...@@ -1227,10 +1229,10 @@
searchEnabled: true, searchEnabled: true,
noDataText: translate.instant('RevenueNoOrgData'), noDataText: translate.instant('RevenueNoOrgData'),
showSelectionControls: true, showSelectionControls: true,
visible : true, visible: true,
deferRendering : false deferRendering: false
}; };
if(exp) if (exp)
_.extend(scope.selectOrgOptions, exp); _.extend(scope.selectOrgOptions, exp);
}; };
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 060ad42c
vatModule.controller('VatPreviewJournalController', ['$rootScope','$scope', '$log', '$filter','$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService', vatModule.controller('VatPreviewJournalController', ['$rootScope', '$scope', '$log', '$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) { function ($rootScope, $scope, $log, $filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict'; 'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1); $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31); $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay'); $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.year+vatSessionService.month; $scope.startMonth = vatSessionService.year + vatSessionService.month;
$scope.endMonth = vatSessionService.year+vatSessionService.month; $scope.endMonth = vatSessionService.year + vatSessionService.month;
$scope.totalMoneyAmount = 0; $scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0; $scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize; $scope.pageSize = constant.vatPagesize;
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
$scope.getDataFromDatabase($scope.queryParams); $scope.getDataFromDatabase($scope.queryParams);
}; };
$scope.getDataFromDatabase = function (queryParams){ $scope.getDataFromDatabase = function (queryParams) {
vatPreviewService.getJEDataForDisplay(queryParams).success(function (data) { vatPreviewService.getJEDataForDisplay(queryParams).success(function (data) {
if (data) { if (data) {
// minDate = data. // minDate = data.
...@@ -103,8 +103,7 @@ ...@@ -103,8 +103,7 @@
//计算本页记录数 //计算本页记录数
if ($scope.queryJournalEntryResult.pageInfo.pageNum === totalPage) { if ($scope.queryJournalEntryResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.pageSize; $scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.pageSize;
} } else {
else {
$scope.curPageItemCount = $scope.pageSize; $scope.curPageItemCount = $scope.pageSize;
} }
...@@ -188,13 +187,15 @@ ...@@ -188,13 +187,15 @@
} }
loadJournalEntryDataFromDB(1); loadJournalEntryDataFromDB(1);
if (!PWC.isNullOrEmpty($scope.criteriaList)) {
if ($scope.criteriaList.length > 6) { if ($scope.criteriaList.length > 6) {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6); $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
$scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length); $scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
} } else {
else {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length); $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
} }
}
$('.filter-button').popover("hide"); $('.filter-button').popover("hide");
}; };
...@@ -260,7 +261,7 @@ ...@@ -260,7 +261,7 @@
var downloadJE = function () { var downloadJE = function () {
vatPreviewService.initExportJEData($scope.queryParams).success(function (data, status, headers) { vatPreviewService.initExportJEData($scope.queryParams).success(function (data, status, headers) {
if(status===204){ if (status === 204) {
SweetAlert.warning("没有数据可以下载"); SweetAlert.warning("没有数据可以下载");
return; return;
} }
...@@ -306,78 +307,234 @@ ...@@ -306,78 +307,234 @@
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条 virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
enableSorting: false, enableSorting: false,
enableColumnMenus: false, enableColumnMenus: false,
enableHorizontalScrollbar : 1, enableHorizontalScrollbar: 1,
columnDefs: [ columnDefs: [
{ name: $translate.instant('ApprovalStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>' }, {
name: $translate.instant('ApprovalStatus'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>'
},
// { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' }, // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
{ name: $translate.instant('Posting'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>' }, {
{ name: $translate.instant('AccountingPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.period}}</span></div>' }, name: $translate.instant('Posting'),
{ name: $translate.instant('DocumentDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>' }, width: 200,
{ name: $translate.instant('JournalSource'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>'
{ name: $translate.instant('JournalCategory'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>' }, },
{ name: $translate.instant('JournalName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.name}}</span></div>' }, {
{ name: $translate.instant('DocumentNo'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>' }, name: $translate.instant('AccountingPeriod'),
{ name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>' }, width: 200,
{ name: $translate.instant('MainBodyDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1Name}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.period}}</span></div>'
{ name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' }, },
{ name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3Name}}</span></div>' }, {
{ name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' }, name: $translate.instant('DocumentDate'),
{ name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' }, width: 200,
{ name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>'
{ name: $translate.instant('ProjectInstruction'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' }, },
{ name: $translate.instant('InterCompanyDescription'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' }, {
{ name: $translate.instant('Alternate1Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' }, name: $translate.instant('JournalSource'),
{ name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' }, width: 200,
{ name: $translate.instant('Currency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>'
{ name: $translate.instant('LocalCurrency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>' }, },
{
name: $translate.instant('JournalCategory'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>'
},
{
name: $translate.instant('JournalName'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.name}}</span></div>'
},
{
name: $translate.instant('DocumentNo'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>'
},
{
name: $translate.instant('Summary'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>'
},
{
name: $translate.instant('MainBodyDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1Name}}</span></div>'
},
{
name: $translate.instant('CostCenterDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>'
},
{
name: $translate.instant('SubjectDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3Name}}</span></div>'
},
{
name: $translate.instant('AuxiliaryAccountDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>'
},
{
name: $translate.instant('ProfitCenterDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>'
},
{
name: $translate.instant('ProductManual'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>'
},
{
name: $translate.instant('ProjectInstruction'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>'
},
{
name: $translate.instant('InterCompanyDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>'
},
{
name: $translate.instant('Alternate1Description'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>'
},
{
name: $translate.instant('Alternate2Description'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>'
},
{
name: $translate.instant('Currency'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>'
},
{
name: $translate.instant('LocalCurrency'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>'
},
{ {
name: $translate.instant('JournalDebitAmount'), name: $translate.instant('JournalDebitAmount'),
headerCellClass:'rightHeader', headerCellClass: 'rightHeader',
width: 200, width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedDr | number:2}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedDr | number:2}}</span></div>'
}, },
{ {
name: $translate.instant('JournalCreditAmount'), name: $translate.instant('JournalCreditAmount'),
headerCellClass:'rightHeader', headerCellClass: 'rightHeader',
width: 200, width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedCr | number:2}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedCr | number:2}}</span></div>'
}, },
{ {
name: $translate.instant('Amount'), name: $translate.instant('Amount'),
headerCellClass:'rightHeader', headerCellClass: 'rightHeader',
width: 200, width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>' cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>'
}, },
{ {
name: $translate.instant('LocalCurrencyDebitAmount'), name: $translate.instant('LocalCurrencyDebitAmount'),
headerCellClass:'rightHeader', headerCellClass: 'rightHeader',
width: 200, width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredDr | number:2}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredDr | number:2}}</span></div>'
}, },
{ {
name: $translate.instant('LocalCurrencyCreditAmount'), name: $translate.instant('LocalCurrencyCreditAmount'),
headerCellClass:'rightHeader', headerCellClass: 'rightHeader',
width: 200, width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredCr | number:2}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredCr | number:2}}</span></div>'
}, },
{ name: $translate.instant('CashFlowEntry'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.cfItem}}</span></div>' }, {
{ name: $translate.instant('City'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute1}}</span></div>' }, name: $translate.instant('CashFlowEntry'),
{ name: $translate.instant('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' }, width: 200,
{ name: $translate.instant('BankAccountNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.cfItem}}</span></div>'
{ name: $translate.instant('BankSerialNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>' }, },
{ name: $translate.instant('SupplierCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>' }, {
{ name: $translate.instant('TransactionOrderNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>' }, name: $translate.instant('City'),
{ name: $translate.instant('SupplierName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>' }, width: 200,
{ name: $translate.instant('ReceiveCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute1}}</span></div>'
{ name: $translate.instant('PreparedBy'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>' }, },
{ name: $translate.instant('Reviewer'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>' }, {
{ name: $translate.instant('CostCenterDepartmentDescription1'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>' }, name: $translate.instant('TransactionDate'),
{ name: $translate.instant('CostCenterDepartmentDescription2'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>' }, width: 200,
{ name: $translate.instant('CostCenterDepartmentDescription3'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>' }, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>'
{ name: $translate.instant('CostCenterDepartmentDescription4'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>' }, },
{ name: $translate.instant('CostCenterDepartmentDescription5'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>' }, {
{ name: $translate.instant('CostCenterDepartmentDescription6'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>' }, name: $translate.instant('BankAccountNumber'),
{ name: $translate.instant('GroupCertificateNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' } width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>'
},
{
name: $translate.instant('BankSerialNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>'
},
{
name: $translate.instant('SupplierCode'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>'
},
{
name: $translate.instant('TransactionOrderNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>'
},
{
name: $translate.instant('SupplierName'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>'
},
{
name: $translate.instant('ReceiveCode'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>'
},
{
name: $translate.instant('PreparedBy'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>'
},
{
name: $translate.instant('Reviewer'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription1'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription2'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription3'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription4'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription5'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription6'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>'
},
{
name: $translate.instant('GroupCertificateNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>'
}
] ]
}; };
...@@ -393,9 +550,9 @@ ...@@ -393,9 +550,9 @@
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month; $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month; $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.orgId = vatSessionService.project.organizationID; $scope.queryParams.orgId = vatSessionService.project.organizationID;
if($rootScope.currentLanguage === 'en-us'){ if ($rootScope.currentLanguage === 'en-us') {
$('.periodInput')[0].style.left = "280px"; $('.periodInput')[0].style.left = "280px";
}else{ } else {
$('.periodInput')[0].style.left = "150px"; $('.periodInput')[0].style.left = "150px";
} }
loadJournalEntryDataFromDB(1); loadJournalEntryDataFromDB(1);
......
atms-web/src/main/webapp/orangeweb/css/app.73dfc5ab.css 0 → 100644
View file @ 060ad42c
.color_active[data-v-60ac6546]{color:red!important}.head[data-v-18a52f4a]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/css/app.e87f05ce.css deleted 100644 → 0
View file @ 1b068d4c
.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-579027fe]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/index.html
View file @ 060ad42c
...@@ -49,4 +49,4 @@ ...@@ -49,4 +49,4 @@
//send 发送 //send 发送
xmlhttp.send(); xmlhttp.send();
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.e87f05ce.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.6ae9ce65.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.e87f05ce.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.6ae9ce65.js></script></body></html> }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.73dfc5ab.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.07374ae8.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.73dfc5ab.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.07374ae8.js></script></body></html>
\ No newline at end of file \ No newline at end of file
atms-web/src/main/webapp/orangeweb/js/app.07374ae8.js.map 0 → 100644
View file @ 060ad42c
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/orangeweb/js/app.6ae9ce65.js.map deleted 100644 → 0
View file @ 1b068d4c
This source diff could not be displayed because it is too large. You can view the blob instead.
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