Skip to content

T
traffic-front
Commit 0e239500 authored by kevin's avatar kevin
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents caad06da b978e2ef
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 967 additions and 352 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/DataImportErrorDto.java 0 → 100644
View file @ 0e239500
package pwc.taxtech.atms.dto.vatdto;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature;
public class DataImportErrorDto {
@JSONField(name="行号")
private Integer cellLine;
@JSONField(name="发票类型" )
private String invoiceType;
@JSONField(name="开票内容")
private String invoiceDetail;
@JSONField(name="开票主体")
private String org;
@JSONField(name="税率")
private String taxRate;
@JSONField(name="税额")
private String amountRate;
@JSONField(name="开票金额")
private String amount;
@JSONField(name="确认/认证日期")
private String confirmTime;
@JSONField(name="金额")
private String cilAmount;
@JSONField(name="Sheet")
private Integer sheet;
public Integer getSheet() {
return sheet;
}
public void setSheet(Integer sheet) {
this.sheet = sheet;
}
public String getConfirmTime() {
return confirmTime;
}
public void setConfirmTime(String confirmTime) {
this.confirmTime = confirmTime;
}
public String getCilAmount() {
return cilAmount;
}
public void setCilAmount(String cilAmount) {
this.cilAmount = cilAmount;
}
public Integer getCellLine() {
return cellLine;
}
public void setCellLine(Integer cellLine) {
this.cellLine = cellLine;
}
public String getInvoiceType() {
return invoiceType;
}
public void setInvoiceType(String invoiceType) {
this.invoiceType = invoiceType;
}
public String getInvoiceDetail() {
return invoiceDetail;
}
public void setInvoiceDetail(String invoiceDetail) {
this.invoiceDetail = invoiceDetail;
}
public String getOrg() {
return org;
}
public void setOrg(String org) {
this.org = org;
}
public String getTaxRate() {
return taxRate;
}
public void setTaxRate(String taxRate) {
this.taxRate = taxRate;
}
public String getAmountRate() {
return amountRate;
}
public void setAmountRate(String amountRate) {
this.amountRate = amountRate;
}
public String getAmount() {
return amount;
}
public void setAmount(String amount) {
this.amount = amount;
}
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/DataImportResponseDto.java 0 → 100644
View file @ 0e239500
package pwc.taxtech.atms.dto.vatdto;
import java.util.List;
public class DataImportResponseDto<T> {
private List<DataImportErrorDto> dataImportErrorDtos;
private List<T> objectList;
public List<DataImportErrorDto> getDataImportErrorDtos() {
return dataImportErrorDtos;
}
public void setDataImportErrorDtos(List<DataImportErrorDto> dataImportErrorDtos) {
this.dataImportErrorDtos = dataImportErrorDtos;
}
public List<T> getObjectList() {
return objectList;
}
public void setObjectList(List<T> objectList) {
this.objectList = objectList;
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 0e239500
......@@ -485,13 +485,13 @@ public class AssetListServiceImpl extends BaseService {
//把购入日期放入到Calendar
cal.setTime(citAsset.getBuyDate());
//获取截止去年累计折旧期间,此值根据分类
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)));
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1));
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH));
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
}
cal.add(Calendar.MONTH,1);
......@@ -507,13 +507,13 @@ public class AssetListServiceImpl extends BaseService {
//把购入日期放入到Calendar
cal.setTime(citAsset.getBuyDate());
//获取截止去年累计折旧期间,此值根据分类
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)));
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1));
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH));
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
}
cal.add(Calendar.MONTH,1);
......@@ -529,13 +529,13 @@ public class AssetListServiceImpl extends BaseService {
//把购入日期放入到Calendar
cal.setTime(citAsset.getBuyDate());
//获取截止去年累计折旧期间,此值根据分类
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)+1));
citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)));
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)+1);
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH)+1);
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)+1);
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
}
//计算开始折旧日期
citAsset.setDepreciationDate(citAsset.getBuyDate());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 0e239500
......@@ -798,7 +798,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功";
CitBalanceSheetPrcAdjustExample example = new CitBalanceSheetPrcAdjustExample();
CitBalanceSheetPrcAdjustExample.Criteria criteria = example.createCriteria();
criteria.andCreateByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period);
criteria.andProjectIdEqualTo(project.getId());
citBSPrcAdjustMapper.deleteByExample(example);
......@@ -937,7 +936,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功";
CitProfitPrcAdjustExample example = new CitProfitPrcAdjustExample();
CitProfitPrcAdjustExample.Criteria criteria = example.createCriteria();
criteria.andCreateByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period);
criteria.andProjectIdEqualTo(project.getId());
citProfitPrcAdjustMapper.deleteByExample(example);
......@@ -1047,7 +1045,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功";
CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
CitEAMAssetsDisposalExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period);
citEAMAssetsMapper.deleteByExample(example);
updateImportLog(EnumCitImportType.EAMAssetsDisposal.getCode());
......@@ -1255,7 +1252,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功";
CitSalaryAdvanceExample example = new CitSalaryAdvanceExample();
CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period);
criteria.andMonthEqualTo(month);
citSalaryAdvanceMapper.deleteByExample(example);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitPreviewDataServiceImpl.java
View file @ 0e239500
......@@ -27,6 +27,8 @@ public class CitPreviewDataServiceImpl extends BaseService {
public PageInfo<CitSalaryAdvance> getCitSalaryAdvanceDataList(CitSalaryDataDto citSalaryDataDto ){
CitSalaryAdvanceExample example = new CitSalaryAdvanceExample();
CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
criteria.andProjectIdEqualTo(citSalaryDataDto.getProjectId());
criteria.andPeriodEqualTo(citSalaryDataDto.getPeriod());
if(!"".equals(citSalaryDataDto.getPoSubjectName()) && citSalaryDataDto.getPoSubjectName() != null){//根据PO主体名称进行查询
criteria.andPoSubjectNameEqualTo(citSalaryDataDto.getPoSubjectName());
}
......@@ -47,6 +49,7 @@ public class CitPreviewDataServiceImpl extends BaseService {
if(periodStart != null && periodEnd == null ){
criteria.andPeriodGreaterThanOrEqualTo(periodStart);
}
Page page = PageHelper.startPage(citSalaryDataDto.getPageInfo().getPageIndex(), citSalaryDataDto.getPageInfo().getPageSize());
List<CitSalaryAdvance> citSalaryAdvances = citSalaryAdvanceMapper.selectByExample(example);
PageInfo<CitSalaryAdvance> pageInfo =new PageInfo<CitSalaryAdvance>(citSalaryAdvances);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 0e239500
......@@ -2070,16 +2070,17 @@ public class ReportServiceImpl extends BaseService {
PeriodDataSource dataSourceModel = null;
if (dataSourceExtendDtos.size() > 0) {
dataSourceModel = dataSourceExtendDtos.get(0).getDataSource();
dataSourceModel= periodDataSourceMapper.selectByPrimaryKey(dataSourceModel.getId());
if (StringUtils.isBlank(data.getKeyinData()))
updateCellValueForDataSourceChange(dataSourceModel, data.getAmount());
originalAmount = dataSourceModel.getAmount() != null ? dataSourceModel.getAmount() : new BigDecimal("0");
dataSourceModel.setName(data.getName());
dataSourceModel.setDescription(data.getDescription());
dataSourceModel.setAmount(data.getAmount());
dataSourceModel.setAmount(data.getAmount()==null?new BigDecimal(0):data.getAmount());
dataSourceModel.setUpdateBy("Admin");
dataSourceModel.setKeyinData(data.getKeyinData());
dataSourceModel.setUpdateTime(new Date());
periodDataSourceMapper.updateByPrimaryKeySelective(dataSourceModel);
periodDataSourceMapper.updateByPrimaryKey(dataSourceModel);
} else {
dataSourceModel = new PeriodDataSource();
Long cellDataSourceId = distributedIdService.nextId();
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/JournalEntryExtendsMapper.xml
View file @ 0e239500
......@@ -37,6 +37,7 @@
<if test="jeCondition.containsAdjustmentRecord!=null">
AND contains_adjustment_record = #{jeCondition.containsAdjustmentRecord,jdbcType=BYTE}
</if>
order by create_time desc
</sql>
<select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.JournalEntryCondition" resultMap="BaseResultMap">
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 0e239500
infrastructureModule
.controller('OrganizationManageController', ['$scope', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
function ($scope, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
.controller('OrganizationManageController', ['$scope', '$location', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
function ($scope, $location, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
'use strict';
$scope.expanded = false;
......@@ -2150,7 +2150,6 @@
// TODO 将这个方法添加到切换功能里
$scope.updateOrgExtraCancel = function () {
$scope.selectCompanyExtra = $scope.comExtraOldData;
$scope.selectCompanyExtra.unifiedSocialCreditCode = $scope.selectCompany.taxPayerNumber;
$scope.editOrgExtraModel = $scope.editOldData;
generalSelectCompanyExtraText();
cancelWebChange();
......@@ -2388,6 +2387,15 @@
});
};
// TODO 跳转到账套界面
$scope.jumpToAccount = function (enterpriseAccountSetID) {
// $location.path("/financialData/enterpriseAccountManage?enterpriseAccountSetID=" + enterpriseAccountSetID);
$location.path("/financialData/enterpriseAccountManage").search({
jumpingEnterpriseAccountSetID: enterpriseAccountSetID
});
};
// 选中机构
$scope.selectOrganization = function (branch) {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 0e239500
......@@ -1438,7 +1438,7 @@
<!-- 账套名称 -->
<span class="block-span"
ng-show="!selectCompany.isUpdate">{{set.enterpriseAccountSetName}}</span>
ng-show="!selectCompany.isUpdate" ng-click="jumpToAccount(set.enterpriseAccountSetID)">{{set.enterpriseAccountSetName}}</span>
<select ng-show="selectCompany.isUpdate"
class="form-control account-set-select"
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js
View file @ 0e239500
......@@ -82,7 +82,7 @@
pageSize: 100,
},
searchPanel: {
visible: true,
visible: false,
width: 240,
placeholder: $translate.instant('SearchPlaceholder')
},
......@@ -106,6 +106,7 @@
//导出数据
$scope.downloadTB = function () {
$scope.queryParams.period = vatSessionService.year;
citPreviewDataService.exportData( $scope.queryParams).success(function (data, status, headers) {
if(status===204){
SweetAlert.warning("没有数据可以下载");
......@@ -119,7 +120,7 @@
$scope.doDataReset = function () {
$scope.queryParams.period = null;
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.compensationSaleAmount = null;
$scope.queryParams.assetLabelNumber = null;
$scope.refreshConfigGrid();
......@@ -129,6 +130,7 @@
}
var initListData = function(){
$scope.queryParams.period = vatSessionService.year;
citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams).success(function (res) {
$scope.listData = commonWebService._index(res.list);
$scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
......@@ -144,6 +146,7 @@
//刷新页面
$scope.refreshConfigGrid = function () {
$scope.queryParams.period = vatSessionService.year;
citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams)
.success(function (res) {
if (res && res.list) {
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html
View file @ 0e239500
......@@ -3,7 +3,7 @@
<div class="popover-content">
<div>
<table class="table table-responsive">
<tr>
<tr style="display: none">
<td>
<span translate="period"></span>
<input class="form-control input-width-middle" placeholder="{{'period' | translate}}" type="text" id="segment3" ng-model="queryParams.period" />
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ 0e239500
......@@ -85,7 +85,7 @@
pageSize: 100,
},
searchPanel: {
visible: true,
visible: false,
width: 240,
placeholder: $translate.instant('SearchPlaceholder')
},
......@@ -107,6 +107,8 @@
//导出数据
$scope.downloadTB = function () {
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.projectId = vatSessionService.project.id;
citPreviewDataService.exportDataSalaryAdvance( $scope.queryParams).success(function (data, status, headers) {
if(status===204){
SweetAlert.warning("没有数据可以下载");
......@@ -120,7 +122,7 @@
$scope.doDataReset = function () {
$scope.queryParams.period = null;
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.poSubjectName = null;
$scope.refreshConfigGrid();
}
......@@ -129,6 +131,8 @@
}
var initListData = function(){
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.projectId = vatSessionService.project.id;
citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope.queryParams).success(function (res) {
$scope.listData = commonWebService._index(res.list);
$scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html
View file @ 0e239500
......@@ -9,7 +9,7 @@
data-templateurl="app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span translate="salaryAdvance" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
</div>
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;width: 200px;display: none" id="input-invoice-period-picker" />
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html
View file @ 0e239500
......@@ -3,7 +3,7 @@
<div class="popover-content">
<div>
<table class="table table-responsive">
<tr>
<tr style="display: none">
<td>
<span translate="period"></span>
<input class="form-control input-width-middle" placeholder="{{'period' | translate}}" type="text" id="segment3" ng-model="queryParams.period" />
......@@ -11,7 +11,7 @@
</tr>
<tr>
<td>
<span translate="compensationSaleAmount"></span>
<span translate="poSubjectName"></span>
<input class="form-control input-width-middle" type="text" placeholder="{{'poSubjectName' | translate}}"id="segment3Name" ng-model="queryParams.poSubjectName" />
</td>
</tr>
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ 0e239500
......@@ -66,7 +66,7 @@
data.list.forEach(function (v) {
v.index = index++;
});
$scope.gridOptions.data = data.list;
$scope.gridDataSource = data.list;
$scope.pagingOptions.totalItems = data.total;
}
......@@ -185,24 +185,60 @@
loadJournalEntryDataFromDB();
});
$scope.gridOptions = {
rowHeight: constant.UIGrid.rowHeight,
selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
enableSorting: false,
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
columnDefs: [
{ 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 title="{{row.entity.accountDescription}}">{{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}}</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>' },
]
bindingOptions: {
dataSource: 'gridDataSource'
},
columns: [
{caption: $translate.instant('AccountCode'),dataField: "accountCode",width: 200},
{caption: $translate.instant('AccountDescription'), dataField: "accountDescription",width: 250},
{caption: $translate.instant('AccountPeriod'), dataField: "accountPeriod",width: 120},
{
caption: $translate.instant('DebitAmount'),
dataField: "debitAmount",
format: {type: 'fixedPoint', precision: 2},
width: 200
},
{
caption: $translate.instant('CreditAmount'),
dataField: "creditAmount",
format: {type: 'fixedPoint', precision: 2},
width: 200
},
{
caption: $translate.instant('BeginningBalance'),
dataField: "beginningBalance",
format: {type: 'fixedPoint', precision: 2},
width: 200
},
{
caption: $translate.instant('EndingBalance'),
dataField: "endingBalance",
format: {type: 'fixedPoint', precision: 2},
width: 200
}
],
// onContentReady: function (e) {
// $scope.extractFinancialInstance = e.component;
// var totalCount = e.component.totalCount();
// if (totalCount > 0) {
// $scope.totalCount = totalCount;
// }
// },
loadPanel: {
enabled: true
},
selection: {
mode: "single"
},
paging: {
pageSize: 50,
},
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText')
};
$scope.doDataFilter = doDataFilter;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html
View file @ 0e239500
......@@ -23,35 +23,15 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white"
ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
<span ng-if="criteriaList.length>6"><br/></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default"
ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white"
ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
<div id="tab_total">
<div class="dt-init-wrapper">
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions">
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div>
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less
View file @ 0e239500
@import "~/app-resources/less/theme.less";
.cit-preview-tb-generate-ver {
background-color: white;
height: 100%;
.numAmount {
padding: 0 3px;
height: 21px;
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
/*background-color: @color-white;*/
padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.dropdown-common() {
display: inline-block;
.filter-button {
width: 30px;
margin-top: 16px;
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 100px;
}
.operation-wrapper {
margin: 15px 25px 10px 10px;
.caret {
margin-top: 8px;
}
span {
cursor: pointer;
.dropdown-menu {
min-width: 100px;
li {
text-align: center;
min-height: 0px;
height: 30px;
line-height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
.filter-popup-wrapper {
display: none;
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.checkbox-custom {
float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
}
.margin-left20 {
margin-left: 20px;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.period-picker {
width: 110px;
border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
&:hover {
opacity: 1.0;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
.dropdown {
.dropdown-common();
}
.glyphicon-white {
color: #fff;
margin-bottom: 2px;
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
> button:last-child {
float: right;
margin-right: 20px;
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
}
}
.remove {
vertical-align: bottom;
top: 0;
.dt-init-wrapper {
margin: 0px 0;
max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
}
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
margin: 0 20px;
.watermark {
.error-info-wrapper {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: .25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
.inputInvoiceGrid {
width: 100%;
height: calc(~'100% - 158px');
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
}
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
height: 40px;
.dt-import-wrapper {
margin: 60px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.dropdown {
.dropdown-common();
i {
display: none;
color: #F85550;
}
}
}
}
.form-control {
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
}
.input-width-middle {
width: 217px;
}
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js
View file @ 0e239500
......@@ -69,7 +69,7 @@
data.list.forEach(function (v) {
v.index = index++;
});
$scope.gridOptions.data = data.list;
$scope.gridDataSource = data.list;
$scope.pagingOptions.totalItems = data.total;
}
......@@ -190,25 +190,61 @@
loadJournalEntryDataFromDB();
});
$scope.gridOptions = {
rowHeight: constant.UIGrid.rowHeight,
selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
enableSorting: false,
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
columnDefs: [
{ name: $translate.instant('Attribute'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute}}<span></div>' },
{ 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 title="{{row.entity.accountDescription}}">{{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}}</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>' },
]
bindingOptions: {
dataSource: 'gridDataSource'
},
columns: [
{caption: $translate.instant('Attribute'),dataField: "attribute",width: 200},
{caption: $translate.instant('AccountCode'),dataField: "accountCode",width: 200},
{caption: $translate.instant('AccountDescription'), dataField: "accountDescription",width: 250},
{caption: $translate.instant('AccountPeriod'), dataField: "accountPeriod",width: 100},
{
caption: $translate.instant('DebitAmount'),
dataField: "debitAmount",
format: {type: 'fixedPoint', precision: 2},
width: 180
},
{
caption: $translate.instant('CreditAmount'),
dataField: "creditAmount",
format: {type: 'fixedPoint', precision: 2},
width: 180
},
{
caption: $translate.instant('BeginningBalance'),
dataField: "beginningBalance",
format: {type: 'fixedPoint', precision: 2},
width: 180
},
{
caption: $translate.instant('EndingBalance'),
dataField: "endingBalance",
format: {type: 'fixedPoint', precision: 2},
width: 180
}
],
// onContentReady: function (e) {
// $scope.extractFinancialInstance = e.component;
// var totalCount = e.component.totalCount();
// if (totalCount > 0) {
// $scope.totalCount = totalCount;
// }
// },
loadPanel: {
enabled: true
},
selection: {
mode: "single"
},
paging: {
pageSize: 50,
},
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText')
};
$scope.doDataFilter = doDataFilter;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html
View file @ 0e239500
......@@ -21,33 +21,15 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
<div id="tab_total">
<div class="dt-init-wrapper">
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions">
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div>
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less
View file @ 0e239500
@import "~/app-resources/less/theme.less";
.cit-preview-tb-mapping-ver {
background-color: white;
height: 100%;
.numAmount {
padding: 0 3px;
height: 21px;
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
/*background-color: @color-white;*/
padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.dropdown-common() {
display: inline-block;
.filter-button {
width: 30px;
margin-top: 16px;
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 100px;
}
.operation-wrapper {
margin: 15px 25px 10px 10px;
.caret {
margin-top: 8px;
}
span {
cursor: pointer;
.dropdown-menu {
min-width: 100px;
li {
text-align: center;
min-height: 0px;
height: 30px;
line-height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
.filter-popup-wrapper {
display: none;
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.checkbox-custom {
float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
}
.margin-left20 {
margin-left: 20px;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.period-picker {
width: 110px;
border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
&:hover {
opacity: 1.0;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
.dropdown {
.dropdown-common();
}
.glyphicon-white {
color: #fff;
margin-bottom: 2px;
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
> button:last-child {
float: right;
margin-right: 20px;
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
}
}
.remove {
vertical-align: bottom;
top: 0;
.dt-init-wrapper {
margin: 0px 0;
max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
}
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
margin: 0 20px;
.watermark {
.error-info-wrapper {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: .25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
.inputInvoiceGrid {
width: 100%;
height: calc(~'100% - 158px');
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
}
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
height: 40px;
.dt-import-wrapper {
margin: 60px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.dropdown {
.dropdown-common();
i {
display: none;
color: #F85550;
}
}
}
}
.form-control {
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
}
.input-width-middle {
width: 217px;
}
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/cit/report/cit-report-layout/cit-report-layout.ctrl.js
View file @ 0e239500
......@@ -202,6 +202,15 @@
$scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
// 将查看纳税申报表权限都赋上
$scope.hasBsPlPermission = true;
$scope.hasBsPermission = true;
$scope.hasPlPermission = true;
$scope.hasTaxReturnPermission = true;
$scope.hasQueryTaxReturnPermission = true;
$scope.hasEditTaxReturnPermission = true;
});
};
var toggleGroup = function (group) {
......
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
View file @ 0e239500
citModule.controller('citReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
citModule.controller('citReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
'apiInterceptor', 'vatExportService', 'SweetAlert', 'BSPLService', 'vatReportService', 'vatReportCacheService', 'vatSessionService',
'loginContext', 'enums', 'vatCommonService', 'vatWorkflowService', 'projectService', '$uibModal', '$cookies', 'Upload', 'vatImportService', 'vatApproveService', 'citReportService',
function ($scope, $rootScope, $log, $translate, $timeout, $q, $compile, $state, $stateParams, apiInterceptor, vatExportService, SweetAlert, BSPLService,
......@@ -48,7 +48,7 @@
$scope.period = getActualPeriod();
$scope.moduleid = enums.vatModuleEnum.Report_TaxDeclaration;
$scope.userId = vatSessionService.logUser.id;
//$scope.isShowUpdateCell = false;
//$scope.isShowUpdateCell = false;
var comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年"
+ ($scope.serviceType === enums.serviceType.VAT ? (getActualPeriod() + "月") : "");
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ 0e239500
......@@ -190,7 +190,12 @@
if (ret.result) {
logDto.UpdateState = $translate.instant('ImportSuccess');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess'));
if(ret.resultMsg){
swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
//SweetAlert.warning(ret.resultMsg);
}else{
SweetAlert.success($translate.instant('ImportSuccess'));
}
} else {
if (ret.resultMsg && ret.resultMsg.length > 0) {
SweetAlert.warning($translate.instant(ret.resultMsg));
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ 0e239500
......@@ -197,7 +197,12 @@
if (ret.result) {
logDto.UpdateState = $translate.instant('ImportSuccess');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess'));
if(ret.resultMsg){
swal($translate.instant('ImportSuccess'), ret.resultMsg, "warning");
//SweetAlert.warning(ret.resultMsg);
}else{
SweetAlert.success($translate.instant('ImportSuccess'));
}
$scope.fileNameShow = false;
} else {
if (ret.resultMsg && ret.resultMsg.length > 0) {
......
atms-web/src/main/webapp/app/common/webservices/citPreviewData.svc.js
View file @ 0e239500
......@@ -4,7 +4,13 @@ webservices.factory('citPreviewDataService', ['$http', 'apiConfig', function ($h
return {
//获取 预提分类数据源列表数据
getCitPreviewSalaryAdvanceDataList : function(params){
return $http.post('/citPreviewDataController/getSalaryAdvaceListData',{pageInfo : params.pagingOptions, periodStart : params.periodStart, periodEnd : params.periodEnd, period : params.period}, apiConfig.createVat());
return $http.post('/citPreviewDataController/getSalaryAdvaceListData',{
pageInfo : params.pagingOptions,
periodStart : params.periodStart,
periodEnd : params.periodEnd,
period : params.period,
projectId: params.projectId
}, apiConfig.createVat());
},
getCitPreviewEamDisposalDataList : function (params) {
return $http.post('/citPreviewDataController/getCitPreviewEamDisposalDataList', {pageInfo : params.pagingOptions, periodStart : params.periodStart, periodEnd : params.periodEnd, organizationId : params.organizationId, period : params.period, compensationSaleAmount: params.compensationSaleAmount, assetLabelNumber : params.assetLabelNumber}, apiConfig.createVat());
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.ctrl.js
View file @ 0e239500
......@@ -240,8 +240,18 @@
columnDefs: [
{ name: $translate.instant('CashFlowEntry'), width: '32%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('Item'), width: '38%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName2}}<span></div>' },
{ name: $translate.instant('CurrentPeriodAmount'), width: '15%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodAmt}}<span></div>' },
{ name: $translate.instant('ThisYearAccumulatedAmount'), width: '15%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.ytdAmt}}<span></div>' }
{
name: $translate.instant('CurrentPeriodAmount'),
headerCellClass:'rightHeader',
width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodAmt | number:2}}<span></div>'
},
{
name: $translate.instant('ThisYearAccumulatedAmount'),
headerCellClass:'rightHeader',
width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.ytdAmt | number:2}}<span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js
View file @ 0e239500
......@@ -287,8 +287,16 @@
{ name: $translate.instant('BillingDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('SalesTaxNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
{ name: $translate.instant('SalesTaxName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
{ name: $translate.instant('Amount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount}}</span></div>' },
{ name: $translate.instant('TaxAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
{
name: $translate.instant('Amount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount | number:2}}</span></div>'
},
{
name: $translate.instant('TaxAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('VerificationMethod'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
{ name: $translate.instant('ConfirmDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('InvoiceType'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-coupa-purchasing-report/vat-preview-coupa-purchasing-report.ctrl.js
View file @ 0e239500
......@@ -297,7 +297,12 @@
{ name: $translate.instant('CoupaDescription'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>' },
{ name: $translate.instant('SupplierNumber'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.supplierNum}}</span></div>' },
{ name: $translate.instant('Supplier'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.supplier}}</span></div>' },
{ name: $translate.instant('Total'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalAmount}}</span></div>' },
{
name: $translate.instant('Total'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Currency'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.currency}}</span></div>' },
{ name: $translate.instant('Bill'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billNum}}</span></div>' },
{ name: $translate.instant('Paid'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.paid}}</span></div>' },
......@@ -311,8 +316,18 @@
{ name: $translate.instant('CoupaBillingDate'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('LastUpdatedDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.lastUpdatedDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('LastUpdatedPerson'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.lastUpdatedPerson}}</span></div>' },
{ name: $translate.instant('CoupaTotalTaxAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalTaxAmount}}</span></div>' },
{ name: $translate.instant('TotalTaxAmountHeader'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalTaxAmountHeader}}</span></div>' },
{
name: $translate.instant('CoupaTotalTaxAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalTaxAmount | number:2}}</span></div>'
},
{
name: $translate.instant('TotalTaxAmountHeader'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalTaxAmountHeader | number:2}}</span></div>'
},
{ name: $translate.instant('BillingNote'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingNote}}</span></div>' }
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-coupa-purchasing-report/vat-preview-coupa-purchasing-report.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.ctrl.js
View file @ 0e239500
......@@ -292,15 +292,42 @@
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.projectName}}<span></div>' },
// { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
{ name: $translate.instant('IDTotalAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalAmount }}<span></div>' },
{ name: $translate.instant('Amount1'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount1}}</span></div>' },
{ name: $translate.instant('Amount2'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount2}}</span></div>' },
{ name: $translate.instant('Amount3'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount3}}</span></div>' },
{ name: $translate.instant('Amount4'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount4}}</span></div>' },
{ name: $translate.instant('Amount5'), cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.amount5}}</span></div>' },
{ name: $translate.instant('Amount6'), cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.amount6}}</span></div>' },
{ name: $translate.instant('Amount7'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount7 }}</span></div>' },
{ name: $translate.instant('OtherAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.otherAmount}}</span></div>' }
{
name: $translate.instant('IDTotalAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalAmount | number:2}}<span></div>' },
{
name: $translate.instant('Amount1'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount1 | number:2}}</span></div>' },
{
name: $translate.instant('Amount2'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount2 | number:2}}</span></div>' },
{
name: $translate.instant('Amount3'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount3 | number:2}}</span></div>' },
{
name: $translate.instant('Amount4'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount4 | number:2}}</span></div>' },
{
name: $translate.instant('Amount5'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents " style="text-align: right"><span>{{row.entity.amount5 | number:2}}</span></div>' },
{
name: $translate.instant('Amount6'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents " style="text-align: right"><span>{{row.entity.amount6 | number:2}}</span></div>' },
{
name: $translate.instant('Amount7'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount7 | number:2}}</span></div>' },
{
name: $translate.instant('OtherAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.otherAmount | number:2}}</span></div>' }
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
View file @ 0e239500
......@@ -300,11 +300,21 @@
{ name: $translate.instant('CustomerCompanyName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.customerCompanyName}}</span></div>' },
{ name: $translate.instant('InvoiceType'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.invoiceType}}</span></div>' },
{ name: $translate.instant('BillingContent'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
{ name: $translate.instant('InvoiceAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.invoiceAmount}}</span></div>' },
{
name: $translate.instant('InvoiceAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span title="{{row.entity.fplx}}">{{row.entity.invoiceAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Applicant'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.applicant}}</span></div>' },
{ name: $translate.instant('OAApplicationNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.oaApplicationNum}}</span></div>' },
{ name: $translate.instant('ContractNo'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractNo }}</span></div>' },
{ name: $translate.instant('ContractAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractAmount}}</span></div>' },
{
name: $translate.instant('ContractAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.contractAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Department'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
{ name: $translate.instant('ApplicationDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDate| date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('BillingDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate| date:"yyyy-MM-dd"}}</span></div>' },
......@@ -314,8 +324,13 @@
{ name: $translate.instant('InvoicePaperNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoicesAmount}}</span></div>' },
{ name: $translate.instant('CustomerCompanyTaxNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.customerCompanyTaxNum}}</span></div>' },
{ name: $translate.instant('CustomerSourceSystem'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractSourceSystem}}</span></div>' },
{ name: $translate.instant('TaxRate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate*100+"%"}}</span></div>' },
{ name: $translate.instant('TaxAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
{ name: $translate.instant('TaxRate'), width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate*100+"%"}}</span></div>' },
{
name: $translate.instant('TaxAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('InvoiceStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' },
{ name: $translate.instant('InvoiceSource'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.source}}</span></div>' },
{ name: $translate.instant('InvoiceRemarks'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.remarks}}</span></div>' }
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 0e239500
......@@ -81,7 +81,7 @@
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].currencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
$scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
}
});
};
......@@ -330,11 +330,36 @@
{ 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'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedDr}}</span></div>' },
{ name: $translate.instant('JournalCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedCr}}</span></div>' },
{ name: $translate.instant('Amount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' },
{ name: $translate.instant('LocalCurrencyDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredDr}}</span></div>' },
{ name: $translate.instant('LocalCurrencyCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredCr}}</span></div>' },
{
name: $translate.instant('JournalDebitAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedDr | number:2}}</span></div>'
},
{
name: $translate.instant('JournalCreditAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedCr | number:2}}</span></div>'
},
{
name: $translate.instant('Amount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>'
},
{
name: $translate.instant('LocalCurrencyDebitAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredDr | number:2}}</span></div>'
},
{
name: $translate.instant('LocalCurrencyCreditAmount'),
headerCellClass:'rightHeader',
width: 200,
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('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.html
View file @ 0e239500
......@@ -17,7 +17,7 @@
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd HH:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ 0e239500
......@@ -538,9 +538,20 @@
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('EndingBalance'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBal}}<span></div>' },
{ name: $translate.instant('InitialBalance'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBal}}</span></div>' }
{
name: $translate.instant('ProjectName'),
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
},
{
name: $translate.instant('EndingBalance'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBal | number:2}}<span></div>'
},
{
name: $translate.instant('InitialBalance'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.begBal | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js
View file @ 0e239500
......@@ -555,9 +555,20 @@
enableSorting: false,
enableColumnMenus: false,
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('CurrentPeriodAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodAmt}}<span></div>' },
{ name: $translate.instant('ThisYearAccumulatedAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.ytdAmt}}</span></div>' }
{
name: $translate.instant('ProjectName'),
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
},
{
name: $translate.instant('CurrentPeriodAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodAmt | number:2}}<span></div>'
},
{
name: $translate.instant('ThisYearAccumulatedAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.ytdAmt | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js
View file @ 0e239500
......@@ -301,8 +301,16 @@
{ name: $translate.instant('FillInDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('RedLetterInfoSalesTaxNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
{ name: $translate.instant('SalespersonName'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
{ name: $translate.instant('RedLetterInfoTotalAmount'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount}}</span></div>' },
{ name: $translate.instant('RedLetterInfoTotalTaxAmount'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount}}</span></div>' },
{
name: $translate.instant('RedLetterInfoTotalAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount | number:2}}</span></div>'
},
{
name: $translate.instant('RedLetterInfoTotalTaxAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('ApplicationSelectionDescription'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
{ name: $translate.instant('ApplicantsManager'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
{ name: $translate.instant('InvoiceCode'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ 0e239500
......@@ -328,14 +328,44 @@
{ 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('BegBal'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBalBeq}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
{ name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
{ name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
{ name: $translate.instant('SeasonDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdDrBeq}}</span></div>' },
{ name: $translate.instant('SeasonCreditsAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdCrBeq}}</span></div>' }
{ name: $translate.instant('Alternate1Description'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
{ name: $translate.instant('Alternate2Description'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
{
name: $translate.instant('BegBal'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.begBalBeq | number:2}}</span></div>'
},
{
name: $translate.instant('DebitAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodDrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('CreditAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodCrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('EndingBalance'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBalBeq | number:2}}</span></div>'
},
{
name: $translate.instant('SeasonDebitAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.qtdDrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('SeasonCreditsAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.qtdCrBeq | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.less
View file @ 0e239500
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
View file @ 0e239500
......@@ -204,9 +204,7 @@
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
// TODO 临时代码,待删除
// 将查看纳税申报表权限都赋上
$scope.hasBsPlPermission = true;
$scope.hasBsPermission = true;
$scope.hasPlPermission = true;
......@@ -214,7 +212,6 @@
$scope.hasQueryTaxReturnPermission = true;
$scope.hasEditTaxReturnPermission = true;
});
};
var toggleGroup = function (group) {
......
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