seimin 1 jaar geleden
bovenliggende
commit
2c94df7368
2 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 3 2
      assets/js/controllers/incident/incidentCtrl.js
  2. 1 1
      assets/js/controllers/mainCtrl.js

+ 3 - 2
assets/js/controllers/incident/incidentCtrl.js

@@ -2653,8 +2653,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2653 2653
         });
2654 2654
         modalInstance.result.then(function (selectedItem) {
2655 2655
             if (selectedItem == 'success') {
2656
-                defaultFilterData.assignee = loginUser.id;
2657
-                $scope.refreshData('expand-right', defaultFilterData);
2656
+                // defaultFilterData.assignee = loginUser.id;
2657
+                // $scope.refreshData('expand-right', defaultFilterData);
2658
+                $scope.chiceIncident($scope.searchkeys,$scope.othcode.state);
2658 2659
             }
2659 2660
         });
2660 2661
     }

+ 1 - 1
assets/js/controllers/mainCtrl.js

@@ -968,7 +968,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
968 968
                                         $rootScope.statuscall = 2;
969 969
                                         $rootScope.callout = 1;
970 970
                                     });
971
-                                    $rootScope.phone = mydata.ano;
971
+                                    $rootScope.phone = mydata.ano.length === 12 ? mydata.ano.replace(/^0/, '') : mydata.ano;
972 972
                                     var Notification = window.Notification;
973 973
                                     Notification.requestPermission();
974 974
                                     var n = new Notification("你有来电", {