呼叫中心修改

assets/js/controllers/customform/customformCtrl.js

@@ -15009,17 +15009,19 @@ appFormly.config(function config(formlyConfigProvider) {
           //     agcountFlag = true;
           //   }
           // }
-          if (localStorage.getItem('phoneNumber')) {
-            var caller = localStorage.getItem('phoneNumber');//呼叫人
-            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);
-            }
+          if (localStorage.getItem('fenjiNumber')) {
+            // var caller = localStorage.getItem('phoneNumber');//呼叫人
+            // 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);
+            // }
+            var caller = localStorage.getItem('fenjiNumber');//呼叫人
+            tlwsa.tlaCallout(teleno, caller, 0);
           } else {
             SweetAlert.swal({
               title: "呼叫失败",

assets/js/controllers/desk/calllogCtrl.js

@@ -350,17 +350,19 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
         //       agcountFlag = true;
         //     }
         //   }
-          if (localStorage.getItem('phoneNumber')) {
-            var caller = localStorage.getItem('phoneNumber');//呼叫人
-            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);//呼叫外线
-            }
+          if (localStorage.getItem('fenjiNumber')) {
+            // var caller = localStorage.getItem('phoneNumber');//呼叫人
+            // 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);//呼叫外线
+            // }
+            var caller = localStorage.getItem('fenjiNumber');//呼叫人
+            tlwsa.tlaCallout(data.callerIdNumber, caller, 0);
           } else {
             SweetAlert.swal({
               title: "呼叫失败",

assets/js/controllers/desk/recordCtrl.js

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

assets/js/controllers/mainCtrl.js

@@ -531,6 +531,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     $scope.changeWorkId = function () {
       event.stopPropagation();
     }
+    
     $rootScope.getSession = function () {
       if ($auth.userIsAuthenticated()) {
         return $auth.retrieveData('auth_headers')
@@ -1300,9 +1301,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_extnNumberObj = {};
         $rootScope.jry_extnNumberSelect = angular.copy(res);
         $rootScope.jry_extnNumberObj.jry_extnNumber = {};
-        $rootScope.jry_extnNumberObj.jry_extnNumber = angular.copy(res[0]);//绑定分机对象
-        $rootScope.jry_extnNumberObj.tel1 = angular.copy(res[0]);//目的号码对象
-        $rootScope.jry_extnNumberObj.tel2 = angular.copy(res[0]);//转接坐席对象
+        var fenjiNumber = localStorage.getItem('fenjiNumber');
+        if(fenjiNumber){
+          $rootScope.jry_extnNumberSelect.forEach(ress=>{
+            if(ress.name == fenjiNumber){
+              $rootScope.jry_extnNumberObj.jry_extnNumber = ress;
+            }
+          })
+        }
+        // $rootScope.jry_extnNumberObj.jry_extnNumber = angular.copy(res[0]);//绑定分机对象
+        // $rootScope.jry_extnNumberObj.tel1 = angular.copy(res[0]);//目的号码对象
+        // $rootScope.jry_extnNumberObj.tel2 = angular.copy(res[0]);//转接坐席对象
         $rootScope.preState = '';//最近一次示忙还是示闲的状态
         //连接
         tlwsa.tlaOpen(websocket_url);
@@ -1494,6 +1503,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               message: '签入成功'
             });
             setTimeout(function () {
+              console.log($rootScope.jry_extnNumberObj.jry_extnNumber.name,1111)
               var fenjiNumber = $rootScope.jry_extnNumberObj.jry_extnNumber.name || localStorage.getItem('fenjiNumber');
               console.log('开始绑定分机【' + fenjiNumber + '】-----seimin');
               tlwsa.tlaSetphonenumber(fenjiNumber);
@@ -1555,6 +1565,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               message: '签出成功'
             });
             localStorage.removeItem('phoneNumber');
+            localStorage.removeItem('fenjiNumber');
+            $rootScope.jry_extnNumberObj.jry_extnNumber = {};
           } else {
             console.log('签出失败-----seimin');
             $.toaster({
@@ -1826,7 +1838,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             });
           }
         }
-        //转接坐席开始回调函数
+        //转接开始回调函数
         TLWSA.onTransferreturn = ontransferreturn;//调用转移方法之后，返回该事件 如果错误码为0，仅仅表示开始转移，不代表转移目标已经接听或已经拒绝
         function ontransferreturn(err) {
           err = Number(err);
@@ -1847,7 +1859,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             });
           }
         }
-        //转接坐席结果回调函数
+        //转接结果回调函数
         TLWSA.onTransferresult = ontransferresult;
         function ontransferresult(err) {
           err = Number(err);
@@ -1871,6 +1883,15 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
 
         // 签入
         $rootScope.jry_qianru = function () {
+          console.log($rootScope.jry_extnNumberObj.jry_extnNumber)
+          if(Object.keys($rootScope.jry_extnNumberObj.jry_extnNumber).length === 0){
+            $.toaster({
+              priority: 'info',
+              title: '警告',
+              message: '绑定分机不能为空'
+            });
+            return;
+          }
           // 签入并绑定分机
           // $rootScope.jry_extnNumberObj.jry_extnNumber.name 分机号
           // $rootScope.user.id  坐席号（用户id）
@@ -1889,13 +1910,43 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_qianchu = function () {
           tlwsa.tlaLogoff();
         }
-        // 呼叫
-        $scope.tlaCallagc = function () {
-          tlwsa.tlaCallagc($rootScope.jry_extnNumberObj.tel1.name)
+        // 呼叫坐席
+        // $scope.tlaCallagc = function () {
+        //   tlwsa.tlaCallagc($rootScope.jry_extnNumberObj.tel1)
+        // }
+        // 呼叫外线
+        $scope.tlaCallout = function () {
+          // 选择目的号码
+          var reg1 = /^[0][1-9]{2,3}-[0-9]{5,10}$/;
+          var reg2 = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/;
+          if(!reg1.test($rootScope.jry_extnNumberObj.tel1)&&!reg2.test($rootScope.jry_extnNumberObj.tel1)){
+            $.toaster({
+              priority: 'info',
+              title: '警告',
+              message: '请输入正确的手机号或座机号'
+            });
+            return;
+          }
+          tlwsa.tlaCallout($rootScope.jry_extnNumberObj.tel1,$rootScope.jry_extnNumberObj.jry_extnNumber.name,0)
         }
-        // 转移
-        $scope.tlaTransfertoagc = function () {
-          tlwsa.tlaTransfertoagc($rootScope.jry_extnNumberObj.tel2.name)
+        // // 转移坐席
+        // $scope.tlaTransfertoagc = function () {
+        //   tlwsa.tlaTransfertoagc($rootScope.jry_extnNumberObj.tel2)
+        // }
+        // 转移外线
+        $scope.tlaTransferout = function () {
+          // 选择转接号码
+          var reg1 = /^[0][1-9]{2,3}-[0-9]{5,10}$/;
+          var reg2 = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/;
+          if(!reg1.test($rootScope.jry_extnNumberObj.tel2)&&!reg2.test($rootScope.jry_extnNumberObj.tel2)){
+            $.toaster({
+              priority: 'info',
+              title: '警告',
+              message: '请输入正确的手机号或座机号'
+            });
+            return;
+          }
+          tlwsa.tlaTransferout($rootScope.jry_extnNumberObj.tel2,$rootScope.jry_extnNumberObj.jry_extnNumber.name,0)
         }
       })
     }

assets/views/partials/off-sidebar2.html

@@ -2,7 +2,7 @@
 <tabset class="sidebar-wrapper" justified="true">
   <tab>
     <tab-heading>
-      当前绑定分机：<i class="fa fa-phone"></i>{{phoneNumber}}
+      当前绑定分机：<i class="fa fa-phone"></i>{{jry_extnNumberObj.jry_extnNumber.name}}
     </tab-heading>
     <div class="tab-pane" id="getup">
       <div class="users-list fontsizes-14">
@@ -40,19 +40,20 @@
                   目的号码:
                 </div>
                 <div class="">
-                  <ui-select class="col-xs-12 margin-top-8" ng-model="jry_extnNumberObj.tel1" theme="bootstrap" ng-change="changeWorkId()">
+                  <input ng-model="jry_extnNumberObj.tel1" class="form-control" placeholder="目的号码" />
+                  <!-- <ui-select class="col-xs-12 margin-top-8" ng-model="jry_extnNumberObj.tel1" theme="bootstrap" ng-change="changeWorkId()">
                     <ui-select-match placeholder="">
                       {{$select.selected.name}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in jry_extnNumberSelect">
                       <div ng-bind-html="item.name"></div>
                     </ui-select-choices>
-                  </ui-select>
+                  </ui-select> -->
                 </div>
               </div>
             </div>
             <div class="col-xs-12">
-              <input type="button" style="margin-left:8px;" value="呼叫" ng-click="tlaCallagc()"
+              <input type="button" style="margin-left:8px;" value="呼叫" ng-click="tlaCallout()"
                 ng-if="jry_state!='laidian'" class="jry_btn">
               
             </div>
@@ -65,7 +66,8 @@
                 转接号码:
               </div>
               <div class="">
-                <ui-select class="col-xs-12 margin-top-8" ng-model="jry_extnNumberObj.tel2" theme="bootstrap"
+                <input ng-model="jry_extnNumberObj.tel2" class="form-control" placeholder="转接号码" />
+                <!-- <ui-select class="col-xs-12 margin-top-8" ng-model="jry_extnNumberObj.tel2" theme="bootstrap"
                   ng-change="changeWorkId()">
                   <ui-select-match placeholder="">
                     {{$select.selected.name}}
@@ -73,11 +75,11 @@
                   <ui-select-choices repeat="item in jry_extnNumberSelect">
                     <div ng-bind-html="item.name"></div>
                   </ui-select-choices>
-                </ui-select>
+                </ui-select> -->
               </div>
             </div>
             <div class="col-xs-12">
-              <input type="button" style="margin-left:8px;" value="转接" ng-click="tlaTransfertoagc()" class="jry_btn">
+              <input type="button" style="margin-left:8px;" value="转接" ng-click="tlaTransferout()" class="jry_btn">
             </div>
           </div>
         </div>

assets/views/report/incident_report.html

@@ -255,7 +255,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="incident_cont_body_TB2">
+                <div class="incident_cont_body_TB2" style="display: none;">
                     事件运维转派, 协同, 升级
                     <div class="TB">
                         <div class="TB_head">
@@ -395,7 +395,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="incident_cont_body_TB2">
+                <div class="incident_cont_body_TB2" style="display: none;">
                     事件区域与事件分类分析图
                     <div class="TB">
                         <div class="TB_head">

assets/views/report/service_form.html

@@ -408,7 +408,7 @@
                                         </th>
                                         <th style="width:16%" ng-click="tableSort('completed')">
                                             <strong>
-                                                受理报修数
+                                                处理报修数
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'completedtop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'completedbottom'}"></i>