Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

dffs\jffs\gl export number format

See merge request root/atms!208

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html

@@ -41,11 +41,11 @@
                             <label class="cell-info-subject-label">{{'ColumnName' | translate}}：</label>
                             {{detail.cellInfo.column}}
                         </div>
-                        <div class="cell-info-subject">
+                        <!--<div class="cell-info-subject">
                             <label class="cell-info-subject-label">{{'Formula' | translate}}</label>
                             <formula-translator formula-list="formulaList" key-value-list="keyValueList" include-optional="false"
                                                 account-data-source="accountDataSource" formula-exp="detail.config.formula"></formula-translator>
-                        </div>
+                        </div>-->
                         <div class="cell-info-subject">
                             <label class="cell-info-subject-label">{{'SourceOrFormula' | translate}}：</label>
                             {{detail.cellInfo.description}}

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

@@ -82,6 +82,27 @@
             };
         };
 
+        var countTotal = function(){
+            $scope.queryParams.pageInfo = {
+                totalCount: -1,
+                pageIndex: 1,
+                pageSize: -1,
+                totalPage: 0,
+            };
+            vatPreviewService.queryInputInvoiceList($scope.queryParams).success(function (data) {
+                if (data) {
+                    var totalMoneyAmount = 0;
+                    var totalTaxAmount = 0;
+                    _.each(data.list, function (x) {
+                        totalMoneyAmount = totalMoneyAmount + parseFloat(x.hjje.replace(/,/g, ""));
+                        totalTaxAmount = totalTaxAmount + parseFloat(x.hjse.replace(/,/g, ""));
+                    })
+                    $scope.totalMoneyAmount = totalMoneyAmount.toLocaleString();
+                    $scope.totalTaxAmount = totalTaxAmount.toLocaleString();
+                }
+            });
+        };
+
         //从数据库中load数据
         var loadIncomeInvoiceItemDataFromDB = function (pageIndex) {
             initIncomeInvoiceItemPagination();
@@ -96,16 +117,6 @@
                 totalPage: 0,
             };
 
-            var countTotal = function(){
-                var totalMoneyAmount = 0;
-                var totalTaxAmount = 0;
-                _.each($scope.gridOptions.data, function (x) {
-                    totalMoneyAmount = totalMoneyAmount + parseFloat(x.hjje.replace(/,/g, ""));
-                    totalTaxAmount = totalTaxAmount + parseFloat(x.hjse.replace(/,/g, ""));
-                })
-                $scope.totalMoneyAmount = totalMoneyAmount.toLocaleString();
-                $scope.totalTaxAmount = totalTaxAmount.toLocaleString();
-            }
 
             vatPreviewService.queryInputInvoiceList($scope.queryParams).success(function (data) {
                 if (data) {
@@ -636,6 +647,7 @@
             //初始化查询条件-期间范围
             $scope.queryParams.periodStart = vatSessionService.month;
             $scope.queryParams.periodEnd = vatSessionService.month;
+            countTotal();
             loadIncomeInvoiceItemDataFromDB(1);
 
         })();