Skip to content

T
traffic-front
Commit 5132c0ac authored by zhkwei's avatar zhkwei
Browse files
Options

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

parent 4020adf1
Hide whitespace changes
Inline Side-by-side
Showing with 352 additions and 303 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java
View file @ 5132c0ac
...@@ -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;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 5132c0ac
...@@ -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);
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 5132c0ac
...@@ -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=")">
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ 5132c0ac
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
data.list.forEach(function (v) { data.list.forEach(function (v) {
v.index = index++; v.index = index++;
}); });
$scope.gridOptions.data = data.list; $scope.gridDataSource = data.list;
$scope.pagingOptions.totalItems = data.total; $scope.pagingOptions.totalItems = data.total;
} }
...@@ -216,63 +216,113 @@ ...@@ -216,63 +216,113 @@
loadJournalEntryDataFromDB(); loadJournalEntryDataFromDB();
}); });
$scope.gridOptions = { $scope.gridOptions = {
rowHeight: constant.UIGrid.rowHeight, bindingOptions: {
selectionRowHeaderWidth: constant.UIGrid.rowHeight, dataSource: 'gridDataSource'
// expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>', },
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条 columns: [
enableSorting: false, {caption: $translate.instant('ApprovalStatus'),dataField: "approvalStatus",width: 120},
enableColumnMenus: false, {caption: $translate.instant('Posting'), dataField: "postedStatus",width: 120},
enableHorizontalScrollbar : 1, {caption: $translate.instant('AccountingPeriod'), dataField: "accountPeriod",width: 80},
columnDefs: [ {caption: $translate.instant('DocumentDate'), dataField: "accountingDate", dataType: "date", format: "yyyy-MM-dd",width: 100},
{ name: $translate.instant('ApprovalStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>' }, {caption: $translate.instant('JournalSource'), dataField: "journalSource",width: 200},
{ name: $translate.instant('Posting'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>' }, {caption: $translate.instant('JournalCategory'), dataField: "category",width: 200},
{ name: $translate.instant('AccountingPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' }, {caption: $translate.instant('JournalName'), dataField: "name",width: 200},
{ name: $translate.instant('DocumentDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>' }, {caption: $translate.instant('DocumentNo'), dataField: "voucherNum",width: 200},
{ name: $translate.instant('JournalSource'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>' }, {caption: $translate.instant('Summary'), dataField: "description",width: 200},
{ name: $translate.instant('JournalCategory'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>' }, {caption: $translate.instant('MainBodyCode'), dataField: "orgCode",width: 200},
{ name: $translate.instant('JournalName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' }, {caption: $translate.instant('costCenter'), dataField: "segment2",width: 200},
{ name: $translate.instant('DocumentNo'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>' }, {caption: $translate.instant('AccountCode'), dataField: "subjectCode",width: 200},
{ name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.description}}">{{row.entity.description}}</span></div>' }, {caption: $translate.instant('AuxiliarySubject'), dataField: "segment4",width: 200},
{ name: $translate.instant('MainBodyCode'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgCode}}</span></div>' }, {caption: $translate.instant('ProfitCenter'), dataField: "segment5",width: 200},
{ name: $translate.instant('MainBodyDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}</span></div>' }, {caption: $translate.instant('Product'), dataField: "segment6",width: 200},
{ name: $translate.instant('AccountCode'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectCode}}</span></div>' }, {caption: $translate.instant('ProjectName'), dataField: "segment7",width: 200},
{ name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.subjectName}}">{{row.entity.subjectName}}</span></div>' }, {caption: $translate.instant('BetweenCompanies'), dataField: "segment8",width: 200},
{ name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' }, {caption: $translate.instant('Alternate1'), dataField: "segment9",width: 200},
{ name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' }, {caption: $translate.instant('Alternate2'), dataField: "segment10",width: 200},
{ name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
{ name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' }, {caption: $translate.instant('MainBodyDescription'), dataField: "orgName",width: 200},
{ name: $translate.instant('ProjectInstruction'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' }, {caption: $translate.instant('CostCenterDescription'), dataField: "segment2Name",width: 200},
{ name: $translate.instant('InterCompanyDescription'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' }, {caption: $translate.instant('SubjectDescription'), dataField: "subjectName",width: 200},
{ name: $translate.instant('Alternate1Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' }, {caption: $translate.instant('AuxiliaryAccountDescription'), dataField: "segment4Name",width: 200},
{ name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' }, {caption: $translate.instant('ProfitCenterDescription'), dataField: "segment5Name",width: 200},
{ name: $translate.instant('Currency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>' }, {caption: $translate.instant('ProductManual'), dataField: "segment6Name",width: 200},
{ name: $translate.instant('LocalCurrency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>' }, {caption: $translate.instant('ProjectInstruction'), dataField: "segment7Name",width: 200},
{ name: $translate.instant('JournalDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedDr}}</span></div>' }, {caption: $translate.instant('InterCompanyDescription'), dataField: "segment8Name",width: 200},
{ name: $translate.instant('JournalCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedCr}}</span></div>' }, {caption: $translate.instant('Alternate1Description'), dataField: "segment9Name",width: 200},
// { name: $translate.instant('Amount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' }, {caption: $translate.instant('Alternate2Description'), dataField: "segment10Name",width: 200},
{ name: $translate.instant('LocalCurrencyDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredDr}}</span></div>' }, {caption: $translate.instant('currency'), dataField: "journalCurrencyCode",width: 200},
{ name: $translate.instant('LocalCurrencyCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredCr}}</span></div>' }, {caption: $translate.instant('LocalCurrency'), dataField: "sobCurrencyCode",width: 200},
{ 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>' }, caption: $translate.instant('JournalDebitAmount'),
{ name: $translate.instant('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' }, dataField: "accountedDr",
{ name: $translate.instant('BankAccountNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>' }, format: {type: 'fixedPoint', precision: 2},
{ name: $translate.instant('BankSerialNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>' }, width: 100
{ name: $translate.instant('SupplierCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>' }, },
{ name: $translate.instant('TransactionOrderNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>' }, {
{ name: $translate.instant('SupplierName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>' }, caption: $translate.instant('JournalCreditAmount'),
{ name: $translate.instant('ReceiveCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>' }, dataField: "accountedCr",
{ name: $translate.instant('PreparedBy'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>' }, format: {type: 'fixedPoint', precision: 2},
{ name: $translate.instant('Reviewer'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>' }, width: 100
{ name: $translate.instant('CostCenterDepartmentDescription1'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>' }, },
{ name: $translate.instant('CostCenterDepartmentDescription2'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>' }, {
{ name: $translate.instant('CostCenterDepartmentDescription3'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>' }, caption: $translate.instant('LocalCurrencyDebitAmount'),
{ name: $translate.instant('CostCenterDepartmentDescription4'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>' }, dataField: "enteredDr",
{ name: $translate.instant('CostCenterDepartmentDescription5'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>' }, format: {type: 'fixedPoint', precision: 2},
{ name: $translate.instant('CostCenterDepartmentDescription6'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>' }, width: 100
{ name: $translate.instant('importWay'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.source}}</span></div>' } },
] {
caption: $translate.instant('LocalCurrencyCreditAmount'),
dataField: "enteredCr",
format: {type: 'fixedPoint', precision: 2},
width: 100
},
{caption: $translate.instant('CashFlowEntry'), dataField: "cfItem",width: 200},
{caption: $translate.instant('City'), dataField: "attribute1",width: 200},
{
caption: $translate.instant('TransactionDate'),
dataField: "attribute2",
dataType: "date",
format: "yyyy-MM-dd",
width: 100
},
{caption: $translate.instant('BankAccountNumber'), dataField: "attribute3",width: 200},
{caption: $translate.instant('BankSerialNumber'), dataField: "attribute4",width: 200},
{caption: $translate.instant('SupplierCode'), dataField: "attribute5",width: 200},
{caption: $translate.instant('TransactionOrderNumber'), dataField: "attribute6",width: 200},
{caption: $translate.instant('SupplierName'), dataField: "attribute7",width: 200},
{caption: $translate.instant('ReceiveCode'), dataField: "attribute8",width: 200},
{caption: $translate.instant('PreparedBy'), dataField: "attribute9",width: 200},
{caption: $translate.instant('Reviewer'), dataField: "attribute10",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription1'), dataField: "attribute11",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription2'), dataField: "attribute12",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription3'), dataField: "attribute13",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription4'), dataField: "attribute14",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription5'), dataField: "attribute15",width: 120},
{caption: $translate.instant('CostCenterDepartmentDescription6'), dataField: "attribute16",width: 120},
{caption: $translate.instant('importWay'), dataField: "source",width: 120}
],
// 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: 100,
},
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText'),
}; };
$scope.doDataFilter = doDataFilter; $scope.doDataFilter = doDataFilter;
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html
View file @ 5132c0ac
...@@ -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}}"> </div>
{{criteria.name}} <div class="page-footer">
</span> <ack-pagination page-options="pagingOptions"
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a> refresh-table="refreshGrid()"></ack-pagination>
</span> </div>
<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>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div> </div>
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less
View file @ 5132c0ac
@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;
} }
}
.nav-wrapper { .caret {
padding-bottom: 10px; margin-top: 8px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
} }
.nav-tab { .dropdown-menu {
/*display: inline-block;*/ min-width: 100px;
span { li {
display: inline-block;
height: 34px;
width: 80px;
text-align: center; text-align: center;
line-height: 34px; min-height: 0px;
padding: 0 10px; height: 30px;
background-color: #B90808; line-height: 30px;
color: #FFF; color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
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;
.numAmount { overflow: hidden;
padding: 0 3px; background-color: #e5e5e5;
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;
}
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.filter-button { .checkbox-custom input[type="checkbox"] {
width: 30px; cursor: pointer;
margin-top: 16px; z-index: 2;
} margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.operation-wrapper { .checkbox-custom label:before {
margin: 15px 25px 10px 10px; 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;
}
span { .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; 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;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
.dropdown {
.dropdown-common();
}
.margin-left20 { input {
margin-left: 20px; width: 50px;
} outline: none;
/*******************************************/ border-radius: 3px;
/*Filter Criteria tags:*/ border: 1px solid #3c3a36;
.tag { padding: 2px;
font-size: 12px; text-align: center;
padding: .3em .4em .4em; }
margin: 0 .1em;
a { > button:last-child {
color: #bbb; float: right;
cursor: pointer; margin-right: 20px;
opacity: 0.6; }
margin: 0 0 0 .3em;
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
&:hover { .btn-vat-primary {
opacity: 1.0; min-width: 80px;
}
} }
}
.glyphicon-white { .dt-init-wrapper {
color: #fff; margin: 0px 0;
margin-bottom: 2px; max-width: 99%;
} height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
} }
.remove { .error-info-wrapper {
vertical-align: bottom; position: absolute;
top: 0; 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;
text-align: center; cursor: n-resize;
z-index: 1000; 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;
}
} }
.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演示 */
.form-control { .page-form-group{
float:right;
&:focus { .page-size{
border-color: transparent; margin:0;
-webkit-box-shadow: none; }
box-shadow: none; .pagination {
border: 1px solid #ccc; margin:0;
} }
} }
}
.input-width-middle { .form-control {
width: 217px; &:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
} }
} }
.input-width-middle {
width: 217px;
}
.popover { .popover {
min-width: 370px; min-width: 370px;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 5132c0ac
...@@ -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;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ 5132c0ac
...@@ -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"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ 5132c0ac
...@@ -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 {
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ 5132c0ac
...@@ -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,
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html
View file @ 5132c0ac
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
<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"
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ 5132c0ac
...@@ -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