Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

dffs\jffs\gl export number format

See merge request root/atms!212

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

@@ -174,12 +174,12 @@
             };
 
         function doConfirmEventHandler() {
+            swal.close();
             var r = /^00\d*|^\.\d+|\.$/;
             if ($scope.detail.inputValue && (isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))) {
                 SweetAlert.warning($translate.instant('CheckInputValueFormat'));
                 return;
-            }
-            if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) {
+            } else if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) {
                 SweetAlert.warning($translate.instant('CheckInputValueLength'));
                 return;
             }
@@ -240,6 +240,8 @@
                     },
                     function (isConfirm) {
                         if (isConfirm) {
+
+
                             doConfirmEventHandler();
                         } else {
                             swal.close();
@@ -554,6 +556,9 @@
                     column: 'cellName',
                     customizeText: function (data) {
                         $("#dataSourceGrid .dx-datagrid-total-footer").hide();
+                        if($scope.detail.cellType == enums.formulaDataSourceType.TrialBalanceSource) {
+                            return $scope.detail.cellInfo.money;
+                        }
                         return $scope.detail.summaryExp;
                     }
                 }, /*{
@@ -566,6 +571,9 @@
                     column: 'cellConditionName',
                     customizeText: function (data) {
                         $("#dataSourceGrid .dx-datagrid-total-footer").hide();
+                        if($scope.detail.cellType == enums.formulaDataSourceType.TrialBalanceSource) {
+                            return $scope.detail.cellInfo.money;
+                        }
                         return $scope.detail.summaryExp;
                     }
                 }/*, {
@@ -738,7 +746,7 @@
                         },
                         {
                             calculateCellValue: function(){
-                                var formula = $scope.detail.config.formular;
+                                var formula = $scope.detail.config.formula;
                                 return formula.match(/\"\d+\"/);
                             },
                             // dataField: 'description',