Merge branch 'hotfix_2' into develop

7 years ago · 536ea593b0
parent 6fc0474464 194b5d60a2
commit 536ea593b0
1 changed files with 6 additions and 6 deletions
--- a/src/main/ui/static/analysis/settle_estimate_analysis.js
+++ b/src/main/ui/static/analysis/settle_estimate_analysis.js
@ -25,12 +25,12 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
        $scope.listLogs();
        $scope.future_loading = true;
        $scope.listEsitimate = function () {
-            // $http.get('/analysis/estimate/future').then(function (resp) {
-            //     $scope.future = resp.data;
-            //     $scope.future_loading = false;
-            // }, function () {
-            //     $scope.future_loading = true;
-            // });
+            $http.get('/analysis/estimate/future').then(function (resp) {
+                $scope.future = resp.data;
+                $scope.future_loading = false;
+            }, function () {
+                $scope.future_loading = true;
+            });
        }
        $scope.listEsitimate();