Merge branch 'fix-wangcz' into dev

src/main/webapp/resources/js/index/app.js

@@ -10389,7 +10389,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
             $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
             $scope.apCheckCondition.$open = false
-            // $scope.searchOrder()
+            $scope.searchOrder()
         }
 
         $scope.addMouthOut = function(val) {
@@ -10480,7 +10480,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (oldVal === null) {
                 return false
             }
-            if ((newVal !== oldVal) && $scope.showNotCheck) {
+            if ((newVal !== oldVal) && !$scope.showNotCheck) {
                 var _newVal = newVal.replace(/-/g,'/')
                 var _d  = new Date(_newVal)
                 _d.setDate(1)
@@ -11369,7 +11369,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
             $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
             $scope.apCheckCondition.$open = false
-            // $scope.searchOrder()
+            $scope.searchOrder()
         }
 
         $scope.addMouthOut = function(val) {
@@ -11462,7 +11462,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (oldVal === null) {
                 return false
             }
-            if ((newVal !== oldVal) && $scope.showNotCheck) {
+            if ((newVal !== oldVal) && !$scope.showNotCheck) {
                 var _d = newVal + '-01'
                 _d = _d.replace(/-/g,'/')
                 _d  = new Date(_d)