Commit 5132c0ac authored by zhkwei's avatar zhkwei

1、CIT试算平衡表Mapping版出现两条数据/2、覆盖导入试算平衡表不能覆盖

parent 4020adf1
...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService {
public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){ public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){
CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust()); CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId()); List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
if(citJournalEntryAdjust.getPeriodEnd()!=null && citJournalEntryAdjust.getPeriodEnd()%100 ==12){
citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd()/100*100+13);
}
List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList); List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList);
if(journalMerges.size()==0){ if(journalMerges.size()==0){
return 0; return 0;
......
...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
continue; continue;
} }
trialBalance.setAccountCode(cellValue.toString().replace(".0","")); // trialBalance.setAccountCode(cellValue.toString().replace(".0",""));
trialBalance.setAccountCode(new BigDecimal(cellValue.toString()).toPlainString());
trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString()); trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString());
trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString()); trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString());
trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString()); trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString());
...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService {
citTrialBalanceMapper.deleteByExample(citTrialBalanceExample); citTrialBalanceMapper.deleteByExample(citTrialBalanceExample);
updateImportLog(EnumCitImportType.TrialBalance.getCode()); updateImportLog(EnumCitImportType.TrialBalance.getCode());
} }
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList); int insertBatchNum = 0;
if(trialBalanceList != null && trialBalanceList.size()>0){
insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
}
//循环遍历成功导入的数据,组装日志记录实体并放入集合 //循环遍历成功导入的数据,组装日志记录实体并放入集合
for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) { for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) {
...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
} }
for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) { for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) {
CitDataImportLog citDataImportLogError = generalCitDataImportLog(entry.getKey(), "", "", String[] split = entry.getKey().split(",");
CitDataImportLog citDataImportLogError = generalCitDataImportLog(split[0], split[1], split[2],
EnumCitImportType.TrialBalance.getCode(), period, EnumCitImportType.TrialBalance.getCode(), period,
"", "试算平衡表", false); "", "试算平衡表", false);
citDataImportLogError.setRecordSize(entry.getValue()); citDataImportLogError.setRecordSize(entry.getValue());
...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功"; msg = "覆盖导入成功";
CitDraftAccountMappingExample example = new CitDraftAccountMappingExample(); CitDraftAccountMappingExample example = new CitDraftAccountMappingExample();
CitDraftAccountMappingExample.Criteria criteria = example.createCriteria(); CitDraftAccountMappingExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period); criteria.andPeriodEqualTo(period);
citDAMappingMapper.deleteByExample(example); citDAMappingMapper.deleteByExample(example);
updateImportLog(EnumCitImportType.DraftAccountMapping.getCode()); updateImportLog(EnumCitImportType.DraftAccountMapping.getCode());
...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService {
BigDecimal lastYearBegBla = new BigDecimal(0); BigDecimal lastYearBegBla = new BigDecimal(0);
CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample(); CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria(); CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria();
criteria.andOrganizationIdEqualTo(project.getOrganizationId());
criteria.andAccountCodeEqualTo(citJournal.getSubjectCode()); criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
criteria.andPeriodEqualTo(project.getYear()-1); criteria.andPeriodEqualTo(project.getYear()-1);
List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample); List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
if(trialBalances != null && trialBalances.size() > 0){ if(trialBalances != null && trialBalances.size() > 0){
lastYearBegBla = trialBalances.get(0).getBeginningBalance(); lastYearBegBla = lastYearBegBla.add(trialBalances.get(0).getBeginningBalance());
} }
trialBalance.setBeginningBalance(lastYearBegBla); trialBalance.setBeginningBalance(lastYearBegBla);
......
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
attribute16, attribute16,
created_by, created_date, late_updated_by, created_by, created_date, late_updated_by,
late_updated_date, create_time, update_time,is_select late_updated_date, create_time, update_time,is_select
from cit_journal_entry_adjust where period like CONCAT('%' ,#{record.period},'%') from cit_journal_entry_adjust where period = #{record.period}
<if test="orgList != null and orgList.size > 0"> <if test="orgList != null and orgList.size > 0">
AND organization_id in AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
......
...@@ -22,33 +22,15 @@ ...@@ -22,33 +22,15 @@
<!--{{'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>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0"> <div id="tab_total">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>: <div class="dt-init-wrapper">
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions">
<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" style="padding-top: 10px">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination> refresh-table="refreshGrid()"></ack-pagination>
</div> </div>
</div>
</div>
</div> </div>
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-preview-journal-merge { .cit-preview-journal-merge {
background-color: white; /*background-color: @color-white;*/
height: 100%; padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.row { .dropdown-common() {
margin-left: 0px; display: inline-block;
margin-bottom:10px;
&>span { .select-button {
float: right; background-color: #F5F5F5;
margin-right: 15px; padding: 6px 0;
cursor: pointer; width: 100px;
} }
.caret {
margin-top: 8px;
} }
.nav-wrapper { .dropdown-menu {
padding-bottom: 10px; min-width: 100px;
border-bottom: 1px solid #DBD8D3;
.nav-header { li {
height: 54px; text-align: center;
line-height: 54px; min-height: 0px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei"; height: 30px;
font-weight: 700; line-height: 30px;
font-style: normal; color: #000;
font-size: 15px; font-weight: normal;
color: #333;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
} }
.nav-tab { #tab_total {
/*display: inline-block;*/ display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span { span {
display: inline-block; margin-left: 10px;
height: 34px; color: #333;
width: 80px;
text-align: center;
line-height: 34px;
padding: 0 10px;
background-color: #B90808;
color: #FFF;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
cursor: pointer; font-weight: bold;
} }
.active { .checkbox-custom {
background-color: #F91000; float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
} }
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
} }
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
} }
.numAmount { .checkbox-custom label:before {
padding: 0 3px; content: '';
height: 21px; position: absolute;
margin-left: 5px; top: 50%;
/* font-family: 'Arial'; */ left: 0;
font-weight: 600; margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px; border-radius: 2px;
font-style: normal; border: 1px solid #bbb;
outline: none; background: #fff;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
} }
.top-area-wrapper { .checkbox-custom input[type="checkbox"]:checked +label:after {
height: 60px; position: absolute;
width: 98%; display: inline-block;
margin: 0 20px; font-family: 'Glyphicons Halflings';
content: "\e013";
.filter-button { top: 42%;
width: 30px; left: 3px;
margin-top: 16px; margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
} }
.checkbox-custom label {
.operation-wrapper {
margin: 15px 25px 10px 10px;
span {
cursor: pointer; cursor: pointer;
} line-height: 1.2;
} font-weight: normal;
margin-bottom: 0;
text-align: left;
} }
.filter-popup-wrapper { .period-picker {
display: none; 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;
.margin-left20 { select {
margin-left: 20px; appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
} }
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
a { .dropdown {
color: #bbb; .dropdown-common();
cursor: pointer; }
opacity: 0.6;
margin: 0 0 0 .3em;
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
&:hover { > button:last-child {
opacity: 1.0; float: right;
margin-right: 20px;
} }
.glyphicon-white { .btn-wrapper {
color: #fff; border-radius: 5px;
margin-bottom: 2px; background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
} }
} }
.remove { .dt-init-wrapper {
vertical-align: bottom; margin: 0px 0;
top: 0; max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
} }
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
} }
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
margin: 0 20px;
.watermark { #content-resizer {
width: 110%;
position: absolute; position: absolute;
top: 50%; height: 4px;
transform: translateY(-50%); bottom: 150px;
opacity: .25; left: 0;
font-size: 3em; right: 0;
width: 100%; 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; text-align: center;
z-index: 1000; display: block !important;
}
} }
.inputInvoiceGrid { .dt-import-wrapper {
width: 100%; margin: 60px 0;
height: calc(~'100% - 158px'); max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents { .dropdown {
height: 40px; .dropdown-common();
i { i {
display: none; color: #F85550;
} }
} }
} }
} }
/*覆写ack-pagination.less中:.page-size, .pagination 中的margin演示 */
.page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
}
}
.form-control { .form-control {
&:focus { &:focus {
border-color: transparent; border-color: transparent;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
} }
.input-width-middle { .input-width-middle {
width: 217px; width: 217px;
}
} }
.popover { .popover {
min-width: 370px; min-width: 370px;
......
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
bindingOptions: { bindingOptions: {
dataSource: 'gridDataSource' dataSource: 'gridDataSource'
}, },
showBorders: true,
columns: [ columns: [
{ {
caption: $translate.instant('AssetType'), caption: $translate.instant('AssetType'),
...@@ -334,47 +333,18 @@ ...@@ -334,47 +333,18 @@
selection: { selection: {
mode: "single" mode: "single"
}, },
grouping: { paging: {
autoExpandAll: false pageSize: 20
}, },
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true,
showRowLines: true, showRowLines: true,
showColumnLines: true, showColumnLines: true,
rowAlternationEnabled: true, //单双行颜色 rowAlternationEnabled: true, //单双行颜色
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText'), noDataText: $translate.instant('NoDataText'),
}; };
// $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('AssetType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetType}}<span></div>' },
// { name: $translate.instant('AssetNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetNumber}}<span></div>' },
// { name: $translate.instant('AssetName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
// { name: $translate.instant('BuyDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.buyDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('DepreciationDate2'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('AssetGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetGroupName}}</span></div>' },
// { name: $translate.instant('AcquisitionValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.acquisitionValue}}</span></div>' },
// { name: $translate.instant('ResidualValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.residualRate}}</span></div>' },
// { name: $translate.instant('YearEndValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.yearEndValue}}</span></div>' },
// { name: $translate.instant('compensationSaleAmount'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.compensationSaleAmount}}</span></div>' },
//
// { name: $translate.instant('DisposalProfitAndLoss'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalProfitAndLoss}}</span></div>' },
//
// { name: $translate.instant('TaxGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxGroupName}}</span></div>' },
// { name: $translate.instant('DepreciationPeriod'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.depreciationPeriod}}</span></div>' },
// { name: $translate.instant('PerMonthDepreciationAmount'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.perMonthDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxToCurrentYearDepreciationPeriod'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxToCurrentYearDepreciationPeriod}}</span></div>' },
// { name: $translate.instant('AccountTotalepreciationAmount'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxToCurrentYearDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxNetValue'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxNetValue}}</span></div>' },
// { name: $translate.instant('DisposalTaxBenefit'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalTaxBenefit}}</span></div>' }
// ]
// };
$scope.doDataFilter = doDataFilter; $scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset; $scope.doDataFilterReset = doDataFilterReset;
......
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions" >
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;">
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
...@@ -207,8 +207,8 @@ ...@@ -207,8 +207,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -284,6 +284,9 @@ ...@@ -284,6 +284,9 @@
grouping: { grouping: {
autoExpandAll: false autoExpandAll: false
}, },
paging: {
pageSize: 20
},
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true, columnAutoWidth: true,
showRowLines: true, showRowLines: true,
......
...@@ -22,11 +22,9 @@ ...@@ -22,11 +22,9 @@
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions" <div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;"> style="margin-top: 30px;">
</div> </div>
</div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination> refresh-table="refreshConfigGrid()"></ack-pagination>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
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