Skip to content

T
traffic-front
Commit 86c9305d authored by gary's avatar gary
Browse files
Options

1、fixbug

parent 7fa60cff
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 51 deletions
atms-dao/etc/generator-mysql/analysisGeneratorConfig.xml
View file @ 86c9305d
......@@ -41,6 +41,16 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
</javaClientGenerator>
<table tableName="analysis_tax_return_end" domainObjectName="AnalysisTaxReturnEnd">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<!--
<table tableName="analysis_actual_tax_return" domainObjectName="AnalysisInternationalTaxData">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<table tableName="analysis_driver_num" domainObjectName="AnalysisDriverNum">
<property name="useActualColumnNames" value="false"/>
......@@ -95,7 +105,7 @@
<table tableName="analysis_tax" domainObjectName="AnalysisTax">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
</table>-->
</context>
</generatorConfiguration>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 86c9305d
......@@ -53,10 +53,10 @@
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
<!--<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="AddImportBtn"
ng-click="doUploadID(importEnum.AddImport)"></button>
ng-click="doUploadID(importEnum.AddImport)"></button>-->
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 86c9305d
......@@ -1032,6 +1032,8 @@ constant.AccountMappingProcessKey = {UnSelected: 'UnSelected', Submit: 'Submit',
constant.pagesize = 50;
constant.vatPagesize = 50;
constant.ErpCheckType = {
CustomInvoice_DuplicatePayNum: 20
}
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -144,15 +145,15 @@
if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryIncomeInvoiceItemResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -116,15 +117,15 @@
var computeCertifiedInvoicesListPage = function () {
if ($scope.queryCertifiedInvoicesListResult.pageInfo && $scope.queryCertifiedInvoicesListResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryCertifiedInvoicesListResult.pageInfo.total / $scope.queryCertifiedInvoicesListResult.pageInfo.pageSize);
totalPage = $scope.queryCertifiedInvoicesListResult.pageInfo.totalCount % $scope.queryCertifiedInvoicesListResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryCertifiedInvoicesListResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryCertifiedInvoicesListResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryCertifiedInvoicesListResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryCertifiedInvoicesListResult.pageInfo.total % $scope.queryCertifiedInvoicesListResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryCertifiedInvoicesListResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryCertifiedInvoicesListResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryCertifiedInvoicesListResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-coupa-purchasing-report/vat-preview-coupa-purchasing-report.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -120,15 +121,15 @@
if ($scope.queryCoupaPurchasingReportResult.pageInfo && $scope.queryCoupaPurchasingReportResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryCoupaPurchasingReportResult.pageInfo.total / $scope.queryCoupaPurchasingReportResult.pageInfo.pageSize);
totalPage = $scope.queryCoupaPurchasingReportResult.pageInfo.totalCount % $scope.queryCoupaPurchasingReportResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryCoupaPurchasingReportResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryCoupaPurchasingReportResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryCoupaPurchasingReportResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryCoupaPurchasingReportResult.pageInfo.total % $scope.queryCoupaPurchasingReportResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryCoupaPurchasingReportResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryCoupaPurchasingReportResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryCoupaPurchasingReportResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-direct-method-cash-flow-statement/vat-preview-direct-method-cash-flow-statement.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize=constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -144,15 +145,15 @@
if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryIncomeInvoiceItemResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -121,15 +122,15 @@
if ($scope.queryInvoiceDataResult.pageInfo && $scope.queryInvoiceDataResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryInvoiceDataResult.pageInfo.total / $scope.queryInvoiceDataResult.pageInfo.pageSize);
totalPage = $scope.queryInvoiceDataResult.pageInfo.totalCount % $scope.queryInvoiceDataResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryInvoiceDataResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryInvoiceDataResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryInvoiceDataResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryInvoiceDataResult.pageInfo.total % $scope.queryInvoiceDataResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryInvoiceDataResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryInvoiceDataResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryInvoiceDataResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -121,15 +122,15 @@
if ($scope.queryInvoiceRecordResult.pageInfo && $scope.queryInvoiceRecordResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryInvoiceRecordResult.pageInfo.total / $scope.queryInvoiceRecordResult.pageInfo.pageSize);
totalPage = $scope.queryInvoiceRecordResult.pageInfo.totalCount % $scope.queryInvoiceRecordResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryInvoiceRecordResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryInvoiceRecordResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryInvoiceRecordResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryInvoiceRecordResult.pageInfo.total % $scope.queryInvoiceRecordResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryInvoiceRecordResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryInvoiceRecordResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryInvoiceRecordResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -96,15 +97,15 @@
if ($scope.queryJournalEntryResult.pageInfo && $scope.queryJournalEntryResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryJournalEntryResult.pageInfo.total / $scope.queryJournalEntryResult.pageInfo.pageSize);
totalPage = $scope.queryJournalEntryResult.pageInfo.totalCount % $scope.queryJournalEntryResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryJournalEntryResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryJournalEntryResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryJournalEntryResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.queryJournalEntryResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryJournalEntryResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -120,15 +121,15 @@
if ($scope.queryBalanceSheetResult.pageInfo && $scope.queryBalanceSheetResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryBalanceSheetResult.pageInfo.total / $scope.queryBalanceSheetResult.pageInfo.pageSize);
totalPage = $scope.queryBalanceSheetResult.pageInfo.totalCount % $scope.queryBalanceSheetResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryBalanceSheetResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryBalanceSheetResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryBalanceSheetResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryBalanceSheetResult.pageInfo.total % $scope.queryBalanceSheetResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryBalanceSheetResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryBalanceSheetResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryBalanceSheetResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -117,15 +118,15 @@
if ($scope.queryProfitLossResult.pageInfo && $scope.queryProfitLossResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryProfitLossResult.pageInfo.total / $scope.queryProfitLossResult.pageInfo.pageSize);
totalPage = $scope.queryProfitLossResult.pageInfo.totalCount % $scope.queryProfitLossResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryProfitLossResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryProfitLossResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryProfitLossResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryProfitLossResult.pageInfo.total % $scope.queryProfitLossResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryProfitLossResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryProfitLossResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryProfitLossResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-quarterly-owners-equity-change-tab/vat-preview-quarterly-owners-equity-change-tab.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize =constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -144,15 +145,15 @@
if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryIncomeInvoiceItemResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -120,15 +121,15 @@
if ($scope.queryRedLetterInfoTabItemResult.pageInfo && $scope.queryRedLetterInfoTabItemResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryRedLetterInfoTabItemResult.pageInfo.total / $scope.queryRedLetterInfoTabItemResult.pageInfo.pageSize);
totalPage = $scope.queryRedLetterInfoTabItemResult.pageInfo.totalCount % $scope.queryRedLetterInfoTabItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryRedLetterInfoTabItemResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryRedLetterInfoTabItemResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryRedLetterInfoTabItemResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryRedLetterInfoTabItemResult.pageInfo.total % $scope.queryRedLetterInfoTabItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryRedLetterInfoTabItemResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryRedLetterInfoTabItemResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryRedLetterInfoTabItemResult.pageInfo.totalPage = totalPage;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ 86c9305d
......@@ -9,6 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -99,15 +100,15 @@
if ($scope.queryTrialBalanceResult.pageInfo && $scope.queryTrialBalanceResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryTrialBalanceResult.pageInfo.total / $scope.queryTrialBalanceResult.pageInfo.pageSize);
totalPage = $scope.queryTrialBalanceResult.pageInfo.totalCount % $scope.queryTrialBalanceResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
var totalPage = parseInt($scope.queryTrialBalanceResult.pageInfo.total / $scope.pageSize);
totalPage = $scope.queryTrialBalanceResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryTrialBalanceResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryTrialBalanceResult.pageInfo.total % $scope.queryTrialBalanceResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.queryTrialBalanceResult.pageInfo.total % $scope.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryTrialBalanceResult.pageInfo.pageSize;
$scope.curPageItemCount = $scope.pageSize;
}
$scope.queryTrialBalanceResult.pageInfo.totalPage = totalPage;
......
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