Skip to content

T
traffic-front
Commit 4023e972 authored by zhkwei's avatar zhkwei
Browse files
Options

1、固定资产逻辑；2、数据预览千分位右对齐

parent a3226328
Hide whitespace changes
Inline Side-by-side
Showing with 551 additions and 273 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 4023e972
......@@ -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+12-cal.get(Calendar.MONTH)-1);
}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+12-cal.get(Calendar.MONTH)-1);
}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);
......@@ -533,9 +533,9 @@ public class AssetListServiceImpl extends BaseService {
//获取截止本年累计折旧期间,此值根据分类
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+12-cal.get(Calendar.MONTH));
}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/CitPreviewDataServiceImpl.java
View file @ 4023e972
......@@ -27,6 +27,9 @@ 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());
criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
if(!"".equals(citSalaryDataDto.getPoSubjectName()) && citSalaryDataDto.getPoSubjectName() != null){//根据PO主体名称进行查询
criteria.andPoSubjectNameEqualTo(citSalaryDataDto.getPoSubjectName());
}
......@@ -47,6 +50,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-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ 4023e972
......@@ -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("没有数据可以下载");
......@@ -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 @ 4023e972
......@@ -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-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ 4023e972
......@@ -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: 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-generate-ver/cit-preview-tb-generate-ver.html
View file @ 4023e972
......@@ -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 @ 4023e972
@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 @ 4023e972
......@@ -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: 120},
{
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 @ 4023e972
......@@ -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 @ 4023e972
@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/common/webservices/citPreviewData.svc.js
View file @ 4023e972
......@@ -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());
......
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