bug:app-overview:listView\cardView

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js

@@ -104,7 +104,7 @@
                         v.taxAmount = PWC.round(v.taxAmount, 2);
                     });
                     $scope.gridOptions.data = data.list;
-                    $scope.queryIncomeInvoiceItemResult.pageInfo = data.pageInfo;
+                    $scope.queryIncomeInvoiceItemResult.pageInfo = data;
                     computeIncomeInvoiceItemPage();
                 }
             });
@@ -118,14 +118,14 @@
         //计算页数，创建分页栏
         var computeIncomeInvoiceItemPage = function () {
 
-            if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount > 0) {
+            if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
 
-                var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.totalCount / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
+                var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
                 totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
 
                 //计算本页记录数
-                if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageIndex === totalPage) {
-                    $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
+                if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
                 }
                 else {
                     $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
@@ -144,6 +144,8 @@
 
                 $('#totalInvoicePage').css('display', 'inline-block');
             } else {
+                //如果查询结果为0，则直接设置本页记录数为0
+                $scope.curPageItemCount = 0;
                 var createPage = $("#totalInvoicePage").createPage({
                     pageCount: 0,
                     current: $scope.curIncomeInvoiceItemPage,
@@ -153,9 +155,6 @@
                     }
                 });
 
-                //如果查询结果为0，则直接设置本页记录数为0
-                $scope.curPageItemCount = 0;
-
                 $('#totalInvoicePage').css('display', 'inline-block');
             }
         };

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.html

@@ -38,7 +38,7 @@
             <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
         </div>
         <div class="pagination-container">
-            <span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.totalCount}}条记录</span>
+            <span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -88,7 +88,7 @@
                         v.taxAmount = PWC.round(v.taxAmount, 2);
                     });
                     $scope.gridOptions.data = data.list;
-                    $scope.queryOutputInvoiceResult.pageInfo = data.pageInfo;
+                    $scope.queryOutputInvoiceResult.pageInfo = data;
                     computeOutputInvoiceItemPage();
                 }
             }).error(function () {
@@ -104,13 +104,13 @@
         //计算页数，创建分页栏
         var computeOutputInvoiceItemPage = function () {
 
-            if ($scope.queryOutputInvoiceResult.pageInfo && $scope.queryOutputInvoiceResult.pageInfo.totalCount > 0) {
+            if ($scope.queryOutputInvoiceResult.pageInfo && $scope.queryOutputInvoiceResult.pageInfo.total > 0) {
 
-                var totalPage = parseInt($scope.queryOutputInvoiceResult.pageInfo.totalCount / $scope.queryOutputInvoiceResult.pageInfo.pageSize);
-                totalPage = $scope.queryOutputInvoiceResult.pageInfo.totalCount % $scope.queryOutputInvoiceResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
+                var totalPage = parseInt($scope.queryOutputInvoiceResult.pageInfo.total / $scope.queryOutputInvoiceResult.pageInfo.pageSize);
+                totalPage = $scope.queryOutputInvoiceResult.pageInfo.total % $scope.queryOutputInvoiceResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
 
-                if ($scope.queryOutputInvoiceResult.pageInfo.pageIndex === totalPage) {
-                    $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.totalCount % $scope.queryOutputInvoiceResult.pageInfo.pageSize;
+                if ($scope.queryOutputInvoiceResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.total % $scope.queryOutputInvoiceResult.pageInfo.pageSize;
                 }
                 else {
                     $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.pageSize;

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.html

@@ -39,7 +39,7 @@
             <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
         </div>
         <div class="pagination-container">
-            <span >本页{{curPageItemCount}}条记录，共{{queryOutputInvoiceResult.pageInfo.totalCount}}条记录</span>
+            <span >本页{{curPageItemCount}}条记录，共{{queryOutputInvoiceResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>