留言列表bugfix

assets/js/controllers/desk/recordCtrl.js

@@ -193,7 +193,7 @@ app.controller("recordCtrl", [
       gridApi.pagination.on.paginationChanged(
         $scope,
         function (newPage, pageSize) {
-          var filtersData = $scope.memoryfilterData;
+          var filtersData = $scope.filData;
           filtersData.idx = newPage - 1;
           filtersData.sum = pageSize;
           $scope.refreshData("expand-right", filtersData);
@@ -715,7 +715,7 @@ app.controller("recordCtrl", [
           id: data.id,
           field1: "1",
           isValid: data.isValid,
-          isExcute: data.isExcute,
+          isExcute: (data.isExcute === 0 || data.isExcute) ? data.isExcute : undefined
         })
         .then(function (data) {
           if (data.status) {
@@ -825,9 +825,14 @@ app.controller("recordCtrl", [
       } else if (data == "bushouli") {
         toData = 2;
       }
-      $scope.filData.hjzxRecord.isExcute = toData;
+      $scope.filData.idx = 0;
+      $scope.filData.hjzxRecord.isExcute = (toData === 0 || toData) ? toData : undefined;
+      if($scope.searchstate == data){
+        $scope.refreshData("expand-right", $scope.filData);
+      }else{
+        $scope.gridOptions.paginationCurrentPage = 0;
+      }
       $scope.searchstate = data;
-      $scope.refreshData("expand-right", $scope.filData);
     };
     // 搜索
     $scope.search = function () {
@@ -857,6 +862,15 @@ app.controller("recordCtrl", [
       }
       $scope.myData = [];
       $scope.gridOptions["sum"] = filterData.sum;
+      var toData = '';
+      if ($scope.searchstate == "weishouli") {
+        toData = 0;
+      } else if ($scope.searchstate == "yishouli") {
+        toData = 1;
+      } else if ($scope.searchstate == "bushouli") {
+        toData = 2;
+      }
+      filterData.hjzxRecord.isExcute = (toData === 0 || toData) ? toData : undefined;
       api_bpm_data.fetchDataList("hjzxRecord", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
@@ -883,6 +897,7 @@ app.controller("recordCtrl", [
       }
       // $scope.myData = [];
       $scope.gridOptions["sum"] = filterData.sum;
+      $scope.gridOptions.paginationCurrentPage = filterData.idx + 1;
       api_bpm_data.fetchDataList("hjzxRecord", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);

assets/js/controllers/incident/incidentCtrl.js

@@ -1133,7 +1133,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             backdrop: "static",
             templateUrl: 'assets/views/incident/tpl/audio.html',
             controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
-                // $rootScope.setbusy();
+                $rootScope.setbusy();
                 $scope.audioUrl = "";
                 $http({
                     url: "http://192.168.77.57:8088/recording/recording?callID=" + data.callID,
@@ -1181,7 +1181,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         modalInstance.result.then(function (result) {
             // $rootScope.setidle();
         }, function (reason) {
-            // $rootScope.setidle();
+            $rootScope.setidle();
         });
     };
     $scope.jry_paging = "";