呼叫外线呼叫坐席，刷新后逻辑处理

assets/js/controllers/customform/customformCtrl.js

@@ -15011,7 +15011,15 @@ appFormly.config(function config(formlyConfigProvider) {
           }
           if (agcountFlag) {
             var caller = localStorage.getItem('phoneNumber');//呼叫人
-            tlwsa.tlaCallout(teleno, caller, 0);
+            console.log(sessionStorage.getItem('phones'))
+            var phones = JSON.parse(sessionStorage.getItem('phones'));
+            var isHuajihao = phones.length?phones.some(v=>v == teleno):false;
+            console.log(isHuajihao)
+            if(isHuajihao){
+              tlwsa.tlaCallagc(teleno);
+            }else{
+              tlwsa.tlaCallout(teleno, caller, 0);
+            }
           } else {
             SweetAlert.swal({
               title: "呼叫失败",

assets/js/controllers/desk/calllogCtrl.js

@@ -353,7 +353,15 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
           }
           if (agcountFlag) {
             var caller = localStorage.getItem('phoneNumber');//呼叫人
-            tlwsa.tlaCallout(data.callerIdNumber, caller, 0);
+            console.log(sessionStorage.getItem('phones'))
+            var phones = JSON.parse(sessionStorage.getItem('phones'));
+            var isHuajihao = phones.length?phones.some(v=>v == data.callerIdNumber):false;
+            console.log(isHuajihao)
+            if(isHuajihao){
+              tlwsa.tlaCallagc(data.callerIdNumber);//呼叫坐席
+            }else{
+              tlwsa.tlaCallout(data.callerIdNumber, caller, 0);//呼叫外线
+            }
           } else {
             SweetAlert.swal({
               title: "呼叫失败",

assets/js/controllers/mainCtrl.js

@@ -1284,6 +1284,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         type: "list"
       }
       api_wechatfile.getDictionary(jry_data_dictionary).then(function (res) {
+        sessionStorage.setItem('phones',JSON.stringify(res.map(v=>v.name)));
         var websocket_url = $rootScope.seiminCallIp;
         $rootScope.jry_extnNumberSelect = [];
         $rootScope.jry_extnNumberObj = {};
@@ -1355,9 +1356,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             });
             //如果设置过话机
             if (localStorage.getItem('phoneNumber')) {
-              // 签入并绑定分机
-              $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
-              tlwsa.tlaLogin($rootScope.phoneNumber, 1, -1);
+              //强制签出，然后签入
+              tlwsa.tlaKillworkid(localStorage.getItem('phoneNumber'));
             }
           } else {
             console.log('呼叫中心连接失败-----seimin');
@@ -1457,7 +1457,6 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         //签入回调函数
         TLWSA.onLoginreturn = onloginreturn;
         function onloginreturn(err) {
-          console.log(err)
           err = Number(err);
           if (!err) {
             console.log('签入成功-----seimin');
@@ -1471,14 +1470,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               tlwsa.tlaSetphonenumber($rootScope.phoneNumber);
             }, 0)
           } else if (err == 9011) {
-            console.log('签入失败-----seimin');
+            console.log('签入失败，该分机已登录-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '签入失败'
+              message: '签入失败，该分机已登录'
             });
-            //强制签出，然后签入
-            tlwsa.tlaKillworkid();
           } else {
             console.log('签入失败-----seimin');
             $.toaster({
@@ -1495,24 +1492,24 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('强制签出成功-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '强制签出成功'
-            });
-            //如果设置过话机
-            if (localStorage.getItem('phoneNumber')) {
-              // 签入并绑定分机
-              $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
-              tlwsa.tlaLogin($rootScope.phoneNumber, 1, -1);
-            }
+            // $.toaster({
+            //   priority: 'info',
+            //   title: '操作',
+            //   message: '强制签出成功'
+            // });
           } else {
-            console.log('强制签出失败-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '强制签出失败'
-            });
+            console.log('强制签出失败,该分机不是签入状态-----seimin');
+            // $.toaster({
+            //   priority: 'info',
+            //   title: '操作',
+            //   message: '强制签出失败'
+            // });
+          }
+          //如果设置过话机
+          if (localStorage.getItem('phoneNumber')) {
+            // 签入并绑定分机
+            $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
+            tlwsa.tlaLogin($rootScope.phoneNumber, 1, -1);
           }
         }
         // 签出回调函数
@@ -1584,19 +1581,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         function oncallreturn(err) {
           err = Number(err);
           if (!err) {
-            console.log('呼叫坐席成功,请摘机-----seimin');
+            console.log('呼叫成功,请摘机-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '呼叫坐席成功,请摘机'
+              message: '呼叫成功,请摘机'
             });
             // $rootScope.jry_state = 'tonghuazhong';
           } else {
-            console.log('呼叫坐席失败-----seimin');
+            console.log('呼叫失败-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '呼叫坐席失败'
+              message: '呼叫失败'
             });
           }
         }
@@ -1607,19 +1604,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           console.log(jso);
           var err = Number(jso.err);
           if (!err) {
-            console.log('呼叫坐席被接听成功-----seimin');
+            console.log('呼叫被接听成功-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '呼叫坐席被接听成功'
+              message: '呼叫被接听成功'
             });
             // $rootScope.jry_state = 'tonghuazhong';
           } else {
-            console.log('呼叫坐席被接听失败-----seimin');
+            console.log('呼叫被接听失败-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '呼叫坐席被接听失败'
+              message: '呼叫被接听失败'
             });
             // $rootScope.jry_state = 'shixian';
           }