暂存

assets/js/controllers/desk/calllogCtrl.js

@@ -123,7 +123,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
             enableFiltering: false,
             cellTemplate: '<div class="links cl-effect-1 pull-left ui-grid-cell-contents">' +
             '<a ng-click="grid.appScope.recordcall(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.yijieFn(row.entity)" class="bianjifont">通话录音</a>' +
-            '<a ng-click="grid.appScope.recordcallid(row.entity)" ng-show="grid.appScope.chuli" class="bianjifont">回拨</a>' +
+            '<a ng-click="grid.appScope.recordcallid(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.isHuibo(row.entity)" class="bianjifont">回拨</a>' +
                  '</div>' 
 
         },
@@ -135,6 +135,13 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
             return false
         }
     }
+    $scope.isHuibo=function(data){
+        if(data.callerIdNumber != $rootScope.phoneNumber){
+            return true
+        }else{
+            return false
+        }
+    }
     $scope.chuli=false;
     for(var i=0;i<loginUser.menu.length;i++){
         if(loginUser.menu[i].link=="tonghualiebiao_chuli"){
@@ -315,6 +322,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
         $scope.jsearchkeys={};
         $scope.refreshData('expand-right',$scope.fileData);
     }
+    
     $scope.recordcallid = function(data) {
         // var telephone = '9' + data.ano;
         // $rootScope.callout = 2;
@@ -333,7 +341,27 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
         //         confirmButtonColor: "#DD6B55"
         //     });
         // }
-        $rootScope.dial(data.callerIdNumber)
+        // $rootScope.dial(data.callerIdNumber)
+        var agcount = tlwsa.tlaGetagentcount();
+          var agcountFlag = false;
+          console.log(data.callerIdNumber)
+          // 查询当前话机是否签入
+          for (var i = 0; i < agcount; i++) {
+            if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
+              agcountFlag = true;
+            }
+          }
+          if (agcountFlag) {
+            var caller = localStorage.getItem('phoneNumber');//呼叫人
+            tlwsa.tlaCallout(data.callerIdNumber, caller, 0);
+          } else {
+            SweetAlert.swal({
+              title: "呼叫失败",
+              text: "请先签入呼叫中心!",
+              type: "error",
+              confirmButtonColor: "#DD6B55",
+            });
+          }
     };
     $scope.ldloading = {};
     $scope.refreshData = function(style, filterData) {

assets/js/controllers/incident/incidentCtrl.js

@@ -2301,6 +2301,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     // 删除事件
     $scope.delSj = function(model){
         console.log(model);
+        return;
         SweetAlert.swal({
             title: "确认删除?",
             text: "删除的数据不可恢复，请确认继续操作!",

assets/js/directives/ola_api2.js

@@ -44,7 +44,7 @@ TLWSA.onTransfertoivrreturn=ontransfertoivrreturn;
 TLWSA.onTransfertoivrandwaitreturn=ontransfertoivrandwaitreturn;
 TLWSA.onStartlistenreturn=onstartlistenreturn;
 TLWSA.onStoplistenreturn=onstoplistenreturn;
-TLWSA.onKillreturn=onkillreturn;
+// TLWSA.onKillreturn=onkillreturn;
 TLWSA.onForceonhookreturn=onforceonhookreturn;
 TLWSA.onIntrudereturn=onintrudereturn;
 TLWSA.onGetcallreturn=ongetcallreturn;
@@ -192,9 +192,9 @@ function onstartlistenreturn(err) {
 function onstoplistenreturn(err) {
     console.log('应答:停止监听请求结果 ' + err);
 }
-function onkillreturn(err) {
-    console.log('应答:强制处理请求结果 ' + err);
-}
+// function onkillreturn(err) {
+//     console.log('应答:强制处理请求结果 ' + err);
+// }
 function onforceonhookreturn(err) {
     console.log('应答:强拆坐席请求结果 ' + err);
 }