呼叫外线，事件列表查看跟角色服务台人员区分

assets/js/controllers/customform/customformCtrl.js

@@ -101,7 +101,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -130,7 +130,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -166,7 +166,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -189,7 +189,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -225,7 +225,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -238,7 +238,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
           view: function (APIService, contentId) {
             return APIService.downloadAttachment(contentId);
@@ -378,7 +378,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -465,7 +465,7 @@ appFormly.config(function config(formlyConfigProvider) {
             }
           );
 
-          gridApi.core.on.filterChanged($scope, function () {});
+          gridApi.core.on.filterChanged($scope, function () { });
 
           gridApi.selection.on.rowSelectionChanged($scope, function (data) {
             $scope.selected.item = data.entity;
@@ -609,7 +609,7 @@ appFormly.config(function config(formlyConfigProvider) {
               // $scope.loadData({ "idx": newPage - 1, "sum": pageSize });
             }
           );
-          gridApi.core.on.filterChanged($scope, function () {});
+          gridApi.core.on.filterChanged($scope, function () { });
           gridApi.selection.on.rowSelectionChanged($scope, function (data) {
             $scope.selected.item = data.entity;
             //console.log(data);
@@ -782,7 +782,7 @@ appFormly.config(function config(formlyConfigProvider) {
                         i + 1 + filterData.idx * filterData.sum;
                     }
                   },
-                  function () {}
+                  function () { }
                 );
               };
               $scope.refreshData("expand-right", defaultFilterData);
@@ -1095,7 +1095,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 i +
                 1 +
                 $scope.memoryfilterDatagridold.idx *
-                  $scope.memoryfilterDatagridold.sum;
+                $scope.memoryfilterDatagridold.sum;
             }
             $scope.gridOptions2["totalItems"] = $scope.myDatagridoldall.length;
             $scope.myDatagridold = $scope.interceptMydata(
@@ -1158,7 +1158,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   i +
                   1 +
                   $scope.memoryfilterDatagridold.idx *
-                    $scope.memoryfilterDatagridold.sum;
+                  $scope.memoryfilterDatagridold.sum;
               }
               $scope.gridOptions2["totalItems"] =
                 $scope.myDatagridallold.length;
@@ -1208,7 +1208,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   i +
                   1 +
                   $scope.memoryfilterDatagridold.idx *
-                    $scope.memoryfilterDatagridold.sum;
+                  $scope.memoryfilterDatagridold.sum;
               }
               $scope.gridOptions2["totalItems"] =
                 $scope.myDatagridoldall.length;
@@ -1257,7 +1257,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   i +
                   1 +
                   $scope.memoryfilterDatagridold.idx *
-                    $scope.memoryfilterDatagridold.sum;
+                  $scope.memoryfilterDatagridold.sum;
               }
               $scope.gridOptions2["totalItems"] =
                 $scope.myDatagridoldall.length;
@@ -1357,7 +1357,7 @@ appFormly.config(function config(formlyConfigProvider) {
             }
           );
 
-          gridApi.core.on.filterChanged($scope, function () {});
+          gridApi.core.on.filterChanged($scope, function () { });
 
           gridApi.selection.on.rowSelectionChanged($scope, function (data) {
             $scope.selected.item = data.entity;
@@ -1441,7 +1441,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -1810,7 +1810,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   }
                 );
 
-                gridApi.core.on.filterChanged($scope, function () {});
+                gridApi.core.on.filterChanged($scope, function () { });
                 gridApi.selection.on.rowSelectionChanged(
                   $scope,
                   function (data) {
@@ -1986,7 +1986,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -2058,7 +2058,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -2130,7 +2130,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -2139,7 +2139,7 @@ appFormly.config(function config(formlyConfigProvider) {
       "$scope",
       "$filter",
       "ngTableParams",
-      function ($scope, $filter, ngTableParams) {},
+      function ($scope, $filter, ngTableParams) { },
     ],
   });
   //审核查看组件
@@ -2150,7 +2150,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -2178,7 +2178,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -3622,7 +3622,7 @@ appFormly.config(function config(formlyConfigProvider) {
             $scope.$parent.$parent.$parent.model &&
             $scope.$parent.$parent.$parent.model.cifilterClassic &&
             cifilterClassic.id !=
-              $scope.$parent.$parent.$parent.model.cifilterClassic.id
+            $scope.$parent.$parent.$parent.model.cifilterClassic.id
           ) {
             // $scope.$parent.$parent.$parent.model.cifilterClassic = $scope.model.cifilterClassic;
             cifilterClassic =
@@ -5294,7 +5294,7 @@ appFormly.config(function config(formlyConfigProvider) {
           // "user": { "roledata": { "rolecode": "roleset" }, "selectType": "1" }
         };
         // $scope.myData = {};
-        $scope.loadData = function (filterData) {};
+        $scope.loadData = function (filterData) { };
         // $scope.title = title;
 
         $scope.loadData({
@@ -5823,7 +5823,7 @@ appFormly.config(function config(formlyConfigProvider) {
           },
         };
         $scope.myData = {};
-        $scope.loadData = function (filterData) {};
+        $scope.loadData = function (filterData) { };
         // $scope.title = title;
 
         $scope.loadData({
@@ -6244,7 +6244,7 @@ appFormly.config(function config(formlyConfigProvider) {
                         i + 1 + filterData.idx * filterData.sum;
                     }
                   },
-                  function () {}
+                  function () { }
                 );
               };
               $scope.refreshData("expand-right", defaultFilterData);
@@ -6980,7 +6980,7 @@ appFormly.config(function config(formlyConfigProvider) {
           // "user": { "roledata": { "rolecode": "roleset" }, "selectType": "1" }
         };
         $scope.myDataone = [];
-        $scope.loadData = function (filterData) {};
+        $scope.loadData = function (filterData) { };
         // $scope.title = title;
 
         $scope.ldloading = {};
@@ -7748,10 +7748,10 @@ appFormly.config(function config(formlyConfigProvider) {
         );
         var thisdaymine = Date.parse(
           thisday.substr(4, 2) +
-            "/" +
-            thisday.substr(6, 2) +
-            "/" +
-            thisday.substr(0, 4)
+          "/" +
+          thisday.substr(6, 2) +
+          "/" +
+          thisday.substr(0, 4)
         );
         var averages = [
           [thisdaymine - 86400000 * 14, 0],
@@ -7799,12 +7799,12 @@ appFormly.config(function config(formlyConfigProvider) {
                       index[0] ==
                       Date.parse(
                         item[0].value.substr(4, 2) +
-                          "/" +
-                          item[0].value.substr(6, 2) +
-                          "/" +
-                          item[0].value.substr(0, 4)
+                        "/" +
+                        item[0].value.substr(6, 2) +
+                        "/" +
+                        item[0].value.substr(0, 4)
                       ) +
-                        86400000
+                      86400000
                     ) {
                       index[1] = Number(item[1].value);
                     }
@@ -7997,10 +7997,10 @@ appFormly.config(function config(formlyConfigProvider) {
           datasetFill: true,
 
           // Function - on animation progress
-          onAnimationProgress: function () {},
+          onAnimationProgress: function () { },
 
           // Function - on animation complete
-          onAnimationComplete: function () {},
+          onAnimationComplete: function () { },
 
           //String - A legend template
           legendTemplate:
@@ -8722,14 +8722,14 @@ appFormly.config(function config(formlyConfigProvider) {
         templateOptions: {},
       };
     },
-    controller: ["$scope", function ($scope) {}],
+    controller: ["$scope", function ($scope) { }],
   });
   //时间段控件（分）
   formlyConfigProvider.setType({
     name: "ui-timeslot",
     extends: "input",
     templateUrl: "assets/views/customform/tpl/ui-responsetime.html",
-    controller: ["$scope", function ($scope) {}],
+    controller: ["$scope", function ($scope) { }],
   });
   //优先级级联-逾期时间
   formlyConfigProvider.setType({
@@ -8824,7 +8824,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          relationAction: function (fields, modelscope, item) {},
+          relationAction: function (fields, modelscope, item) { },
         },
         validators: {
           required: {
@@ -9076,7 +9076,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          relationAction: function (fields, modelscope, item) {},
+          relationAction: function (fields, modelscope, item) { },
         },
         validators: {
           required: {
@@ -9168,7 +9168,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          relationAction: function (fields, modelscope, item) {},
+          relationAction: function (fields, modelscope, item) { },
         },
         validators: {
           required: {
@@ -9326,13 +9326,13 @@ appFormly.config(function config(formlyConfigProvider) {
               .then(function (res) {
                 $scope.model.incident.expectResponseTime =
                   $scope.$parent.$parent.$parent.model.incident.expectResponseTime =
-                    res.serviceLevelAgreement.responseTime;
+                  res.serviceLevelAgreement.responseTime;
                 $scope.model.incident.expectIntroTime =
                   $scope.$parent.$parent.$parent.model.incident.expectIntroTime =
-                    res.serviceLevelAgreement.resolveTime;
+                  res.serviceLevelAgreement.resolveTime;
                 $scope.model.incident.overdueTime =
                   $scope.$parent.$parent.$parent.model.incident.overdueTime =
-                    res.date;
+                  res.date;
               });
           }
           api_zsk.solutionQuote(item.id).then(function (response) {
@@ -9359,9 +9359,9 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
-          linkage: function (modelName, data) {},
+          linkage: function (modelName, data) { },
         },
       };
     },
@@ -9620,7 +9620,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transform: function (value) {},
+          transform: function (value) { },
         },
       };
     },
@@ -9645,7 +9645,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transform: function (value) {},
+          transform: function (value) { },
         },
       };
     },
@@ -9726,7 +9726,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transform: function (value) {},
+          transform: function (value) { },
         },
       };
     },
@@ -9787,7 +9787,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transform: function (value) {},
+          transform: function (value) { },
         },
       };
     },
@@ -9877,7 +9877,7 @@ appFormly.config(function config(formlyConfigProvider) {
         templateOptions: {},
       };
     },
-    controller: ["$scope", function ($scope) {}],
+    controller: ["$scope", function ($scope) { }],
   });
   //含有周的日期
   formlyConfigProvider.setType({
@@ -9897,7 +9897,7 @@ appFormly.config(function config(formlyConfigProvider) {
       function ($scope, $filter) {
         $scope.mindata = new Date(
           $scope.options.templateOptions.transform($scope.model).getTime() +
-            5 * 60 * 1000
+          5 * 60 * 1000
         );
         if ($scope.model[$scope.options.key]) {
         } else {
@@ -10723,7 +10723,7 @@ appFormly.config(function config(formlyConfigProvider) {
         // console.log($scope.model[$scope.options.key],'lmm');
         $scope.mindata = new Date(
           $scope.options.templateOptions.transform($scope.model).getTime() +
-            5 * 60 * 1000
+          5 * 60 * 1000
         );
         if ($scope.model[$scope.options.key]) {
           $scope.model[$scope.options.key] = $filter("date")(
@@ -10761,7 +10761,7 @@ appFormly.config(function config(formlyConfigProvider) {
       function ($scope, $filter) {
         $scope.mindata = new Date(
           $scope.options.templateOptions.transform($scope.model).getTime() +
-            5 * 60 * 1000
+          5 * 60 * 1000
         );
         if ($scope.model[$scope.options.key]) {
           $scope.model[$scope.options.key] = $filter("date")(
@@ -11131,7 +11131,7 @@ appFormly.config(function config(formlyConfigProvider) {
           "$rootScope",
           "api_bpm_domain",
           "$stateParams",
-          function ($scope, $rootScope, api_bpm_domain,$stateParams) {
+          function ($scope, $rootScope, api_bpm_domain, $stateParams) {
             // $scope.myFilter = function(item) {
             //     return !$scope.search || $select.selected[to.labelProp || 'name'] == $scope.search;
             // }
@@ -11173,7 +11173,7 @@ appFormly.config(function config(formlyConfigProvider) {
             console.log($scope, 77777);
             if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
               var paramsModel = JSON.parse($stateParams.model)
-              if ($scope.options.templateOptions.onlyKey == "c_account"&&paramsModel.model.incident.requester.account) {
+              if ($scope.options.templateOptions.onlyKey == "c_account" && paramsModel.model.incident.requester.account) {
                 $scope.$parent.$parent.$parent.model.repeatIncidentShow = true;
                 $scope.$parent.$parent.$parent.model.incident.account = paramsModel.model.incident.requester.account;
               }
@@ -11252,7 +11252,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 1000,
         },
       };
@@ -11300,11 +11300,11 @@ appFormly.config(function config(formlyConfigProvider) {
                 var modelVal = $scope.model[$scope.options.key];
                 var ides = [];
                 var rList = result.list || result;
-                if($scope.options.key == "serviceTypeIds"){
-                  modelVal = modelVal.map(function(v){
-                    if(typeof v !== 'object'){
-                      return {id:v};
-                    }else{
+                if ($scope.options.key == "serviceTypeIds") {
+                  modelVal = modelVal.map(function (v) {
+                    if (typeof v !== 'object') {
+                      return { id: v };
+                    } else {
                       return v;
                     }
                   })
@@ -11316,10 +11316,10 @@ appFormly.config(function config(formlyConfigProvider) {
                     }
                   }
                 }
-                ides.forEach(function(v1){
-                  rList.forEach(function(v2){
-                    if(v1 == v2.id){
-                      rList = rList.filter(v=>v.id!=v2.id);
+                ides.forEach(function (v1) {
+                  rList.forEach(function (v2) {
+                    if (v1 == v2.id) {
+                      rList = rList.filter(v => v.id != v2.id);
                     }
                   })
                 })
@@ -11640,8 +11640,8 @@ appFormly.config(function config(formlyConfigProvider) {
             // console.log(items)
           },
           refresh: function (items, search, fn) {
-            console.log(items,options);
-            
+            console.log(items, options);
+
             var treedata = [];
 
             function convertListToTree(data, treeMap) {
@@ -11967,28 +11967,28 @@ appFormly.config(function config(formlyConfigProvider) {
                 .refreshData(options.templateOptions.APIService)
                 .then(function (result) {
                   //回显事件分类，带出绑定的人或组start caocao
-                  if(items.$parent.originalModel.incident && items.$parent.originalModel.incident.category){
-                    console.log(result[options.templateOptions.optionsDataKey],items.$parent.model.category.id)
-                    var item = result[options.templateOptions.optionsDataKey].find(function(v){
+                  if (items.$parent.originalModel.incident && items.$parent.originalModel.incident.category) {
+                    console.log(result[options.templateOptions.optionsDataKey], items.$parent.model.category.id)
+                    var item = result[options.templateOptions.optionsDataKey].find(function (v) {
                       return v.id == items.$parent.originalModel.incident.category.id;
                     })
                     console.log(item)//11615
-                    if(item){
-                      if(item.userOrGroupType===1){
-                        items.$parent.originalModel.start_code='assignment';
-                        items.$parent.originalModel.incident.handlerUser={id:item.handleUser?item.handleUser.id:undefined};
-                        items.$parent.originalModel.directClose=true;
-                        items.$parent.originalModel.isHandlerUser=false;
-                        setTimeout(function(){items.$parent.originalModel.isHandlerUser=true;},0)
-                      }else if(item.userOrGroupType===2){
-                        items.$parent.originalModel.start_code='assignment';
-                        items.$parent.originalModel.candidateGroups=item.group;
-                        items.$parent.originalModel.directClose=true;
-                        items.$parent.originalModel.isHandlerUser=false;
-                      }else{
-                        items.$parent.originalModel.start_code='close';
-                        items.$parent.originalModel.directClose=false;
-                        items.$parent.originalModel.isHandlerUser=false;
+                    if (item) {
+                      if (item.userOrGroupType === 1) {
+                        items.$parent.originalModel.start_code = 'assignment';
+                        items.$parent.originalModel.incident.handlerUser = { id: item.handleUser ? item.handleUser.id : undefined };
+                        items.$parent.originalModel.directClose = true;
+                        items.$parent.originalModel.isHandlerUser = false;
+                        setTimeout(function () { items.$parent.originalModel.isHandlerUser = true; }, 0)
+                      } else if (item.userOrGroupType === 2) {
+                        items.$parent.originalModel.start_code = 'assignment';
+                        items.$parent.originalModel.candidateGroups = item.group;
+                        items.$parent.originalModel.directClose = true;
+                        items.$parent.originalModel.isHandlerUser = false;
+                      } else {
+                        items.$parent.originalModel.start_code = 'close';
+                        items.$parent.originalModel.directClose = false;
+                        items.$parent.originalModel.isHandlerUser = false;
                         delete items.$parent.originalModel.candidateGroups;
                         delete items.$parent.originalModel.incident.handlerUser
                       }
@@ -12226,7 +12226,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -12240,7 +12240,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () {},
+          refresh: function () { },
           refreshDelay: 0,
         },
       };
@@ -12720,7 +12720,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          linkage: function () {},
+          linkage: function () { },
         },
       };
     },
@@ -13048,7 +13048,7 @@ appFormly.config(function config(formlyConfigProvider) {
       "api_bpm_data",
       "Restangular",
       function ($scope, api_bpm_data, Restangular) {
-        console.log($scope,'ui-handlerLog')
+        console.log($scope, 'ui-handlerLog')
       },
     ],
   });
@@ -13061,7 +13061,7 @@ appFormly.config(function config(formlyConfigProvider) {
       "api_bpm_data",
       "Restangular",
       function ($scope, api_bpm_data, Restangular) {
-        console.log($scope,'ui-zc');
+        console.log($scope, 'ui-zc');
         $scope.wxIncidentWithCmdb = JSON.parse(sessionStorage.getItem("wxIncidentWithCmdb"));//资产
       },
     ],
@@ -13075,13 +13075,13 @@ appFormly.config(function config(formlyConfigProvider) {
       "api_cmdb2",
       "Restangular",
       function ($scope, api_cmdb2, Restangular) {
-        console.log($scope,'ui-hc')
+        console.log($scope, 'ui-hc')
         $scope.incidentWithConsumable = JSON.parse(sessionStorage.getItem("incidentWithConsumable"));//耗材
         $scope.list = [];
         var sjId = $scope.model.incident.id;
         api_cmdb2.getHc(sjId).then(function (response) {
           console.log(response)
-          if(response.status == 200){
+          if (response.status == 200) {
             $scope.list = response.data;
           }
         })
@@ -13251,7 +13251,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transtlara: function (value, $scope) {},
+          transtlara: function (value, $scope) { },
         },
       };
     },
@@ -13328,7 +13328,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options, $scope, $rootScope, api_statistic) {
       return {
         templateOptions: {
-          checkform: function (options) {},
+          checkform: function (options) { },
         },
       };
     },
@@ -13353,7 +13353,7 @@ appFormly.config(function config(formlyConfigProvider) {
             }
           },
           addRequeter: function (size, options, modal, e) {
-            if(e){
+            if (e) {
               if (e.clientX === 0) {
                 return;
               }
@@ -13385,7 +13385,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
                   var paramsModel = JSON.parse($stateParams.model)
                   //来电-添加报修人-回显电话
-                  if(paramsModel.model.incident.requester.hjzxPhone){
+                  if (paramsModel.model.incident.requester.hjzxPhone) {
                     $scope.requester.mphone = paramsModel.model.incident.requester.hjzxPhone;
                   }
                 }
@@ -13775,7 +13775,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   });
                 }
               },
-              function () {}
+              function () { }
             );
           },
           changeRequeter: function (
@@ -14038,7 +14038,7 @@ appFormly.config(function config(formlyConfigProvider) {
                   });
                 }
               },
-              function () {}
+              function () { }
             );
             event.preventDefault();
           },
@@ -14050,13 +14050,13 @@ appFormly.config(function config(formlyConfigProvider) {
       "api_user_data",
       "api_statistic",
       "$stateParams",
-      function ($scope, api_user_data, api_statistic,$stateParams) {
+      function ($scope, api_user_data, api_statistic, $stateParams) {
         console.log($stateParams)
         if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
           var paramsModel = JSON.parse($stateParams.model)
           //来电-添加报修人
-          if(paramsModel.model.incident.requester.hjzxPhone){
-            $scope.options.templateOptions['addRequeter']('lg',$scope.options,$scope.to.modal);
+          if (paramsModel.model.incident.requester.hjzxPhone) {
+            $scope.options.templateOptions['addRequeter']('lg', $scope.options, $scope.to.modal);
           }
         }
         $scope.options.initialValue = $scope.model[$scope.options.key];
@@ -14705,7 +14705,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          linkage: function () {},
+          linkage: function () { },
         },
       };
     },
@@ -14986,7 +14986,7 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          transform: function (value) {},
+          transform: function (value) { },
         },
       };
     },
@@ -15000,14 +15000,18 @@ appFormly.config(function config(formlyConfigProvider) {
           var gid = "@0";
           var telephone = "9" + teleno;
           $rootScope.callout = 2;
-          if ($rootScope.takes) {
-            api_text
-              .dialout($rootScope.takes, gid, telephone)
-              .then(function (data) {
-                if (data.errno == 0) {
-                  $rootScope.status = 6;
-                }
-              });
+          var agcount = tlwsa.tlaGetagentcount();
+          var agcountFlag = false;
+          console.log(teleno)
+          // 查询当前话机是否签入
+          for (var i = 0; i < agcount; i++) {
+            if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
+              agcountFlag = true;
+            }
+          }
+          if (agcountFlag) {
+            var caller = localStorage.getItem('phoneNumber');//呼叫人
+            tlwsa.tlaCallout(teleno, caller, 0);
           } else {
             SweetAlert.swal({
               title: "呼叫失败",
@@ -15804,7 +15808,7 @@ appFormly.config(function config(formlyConfigProvider) {
                                 scope.grid.appScope.selected.items
                               ) &&
                               scope.grid.appScope.selected.items[i].id ==
-                                scope.grid.appScope.selected.items[z].id &&
+                              scope.grid.appScope.selected.items[z].id &&
                               i != z
                             ) {
                               scope.grid.appScope.selected.items.splice(i, 1);
@@ -19114,7 +19118,7 @@ appFormly.config(function config(formlyConfigProvider) {
         },
       };
     },
-    controller: ["$scope", "$timeout", function ($scope, $timeout) {}],
+    controller: ["$scope", "$timeout", function ($scope, $timeout) { }],
   });
 
   //repeatSection
@@ -19169,11 +19173,11 @@ appFormly.config(function config(formlyConfigProvider) {
           field.id =
             field.id ||
             field.key +
-              "_" +
-              index +
-              "_" +
-              $scope.options.templateOptions.unique +
-              getRandomInt(0, 9999);
+            "_" +
+            index +
+            "_" +
+            $scope.options.templateOptions.unique +
+            getRandomInt(0, 9999);
         });
       }
 
@@ -19863,13 +19867,13 @@ appFormly.config(function config(formlyConfigProvider) {
                         .attr(
                           "d",
                           "M" +
-                            mousedown_node.x +
-                            "," +
-                            mousedown_node.y +
-                            "L" +
-                            mousedown_node.x +
-                            "," +
-                            mousedown_node.y
+                          mousedown_node.x +
+                          "," +
+                          mousedown_node.y +
+                          "L" +
+                          mousedown_node.x +
+                          "," +
+                          mousedown_node.y
                         );
 
                       restart();
@@ -21266,7 +21270,7 @@ appFormly.controller("CustomformCtrl", [
                   if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
                     var paramsModel = JSON.parse($stateParams.model)
                     //来电-传话机id
-                    if(paramsModel.model.incident.sockid){
+                    if (paramsModel.model.incident.sockid) {
                       data0327.incident.callID = paramsModel.model.incident.sockid;
                     }
                   }
@@ -21281,7 +21285,7 @@ appFormly.controller("CustomformCtrl", [
                             if (
                               $scope.fileUploader != null &&
                               $scope.fileUploader.getNotUploadedItems().length >
-                                0 &&
+                              0 &&
                               resData.id
                             ) {
                               $scope.fileUploader.onBeforeUploadItem =
@@ -21357,97 +21361,97 @@ appFormly.controller("CustomformCtrl", [
                   console.log(vm);
                   //处理日志
                   // 处理日志不为空并且事件是处理中状态
-                  if(vm.model.handlerLog&&vm.model.handlerLog.trim()&&vm.model.incident.state.value == 'handler'){
-                    api_bpm_data.addData('operationLog',{operationLog:{opType:'handlerLog',opValue:vm.model.handlerLog,extra1:vm.model.incident.id}}).then(function(result1){
+                  if (vm.model.handlerLog && vm.model.handlerLog.trim() && vm.model.incident.state.value == 'handler') {
+                    api_bpm_data.addData('operationLog', { operationLog: { opType: 'handlerLog', opValue: vm.model.handlerLog, extra1: vm.model.incident.id } }).then(function (result1) {
                       baseHandler();
                     })
-                  }else{
+                  } else {
                     baseHandler();
                   }
                   // return;
-                  function baseHandler(){
+                  function baseHandler() {
                     api_bpm_domain
-                    .complete($stateParams.taskId, userId, vm.model)
-                    .then(function (response) {
-                      if (response) {
-                        var resData = Restangular.stripRestangular(response);
-                        SweetAlert.swal(
-                          {
-                            title: "提交成功!",
-                            type: "success",
-                            confirmButtonColor: "#007AFF",
-                          },
-                          function () {
-                            if (
-                              $scope.fileUploader != null &&
-                              $scope.fileUploader.getNotUploadedItems().length >
+                      .complete($stateParams.taskId, userId, vm.model)
+                      .then(function (response) {
+                        if (response) {
+                          var resData = Restangular.stripRestangular(response);
+                          SweetAlert.swal(
+                            {
+                              title: "提交成功!",
+                              type: "success",
+                              confirmButtonColor: "#007AFF",
+                            },
+                            function () {
+                              if (
+                                $scope.fileUploader != null &&
+                                $scope.fileUploader.getNotUploadedItems().length >
                                 0
-                            ) {
-                              console.log(vm);
-                              if (vm.model.incident) {
-                                // $scope.fileUploader.onBeforeUploadItem = function (item) {
-                                //     angular.extend(item.headers, $rootScope.getSession());
-                                //     item.url = api_bpm_domain.uploadAttachmentJryModel("incident", vm.model.problem.id, '00000', $rootScope.user.id).getRequestedUrl();
-                                //     item.formData.push({
-                                //         'fileName': item.file.name
-                                //     });
-                                // };
-                                // $scope.fileUploader.uploadAll();
-                                $scope.fileUploader.onBeforeUploadItem =
-                                  function (item) {
-                                    angular.extend(
-                                      item.headers,
-                                      $rootScope.getSession()
-                                    );
-                                    item.url = api_bpm_domain
-                                      .uploadAttachment(
-                                        vm.model.incident.processInstanceId,
-                                        "00000",
-                                        $rootScope.user.id
-                                      )
-                                      .getRequestedUrl();
-                                    item.formData.push({
-                                      fileName: item.file.name,
-                                    });
-                                    //console.log();
-                                  };
-                                $scope.fileUploader.uploadAll();
-                              } else if (vm.model.problem) {
-                                $scope.fileUploader.onBeforeUploadItem =
-                                  function (item) {
-                                    angular.extend(
-                                      item.headers,
-                                      $rootScope.getSession()
-                                    );
-                                    item.url = api_bpm_domain
-                                      .uploadAttachmentJryModel(
-                                        "problem",
-                                        vm.model.problem.id,
-                                        "00000",
-                                        $rootScope.user.id
-                                      )
-                                      .getRequestedUrl();
-                                    item.formData.push({
-                                      fileName: item.file.name,
-                                    });
-                                  };
-                                $scope.fileUploader.uploadAll();
-                              } else if (vm.model.change) {
+                              ) {
+                                console.log(vm);
+                                if (vm.model.incident) {
+                                  // $scope.fileUploader.onBeforeUploadItem = function (item) {
+                                  //     angular.extend(item.headers, $rootScope.getSession());
+                                  //     item.url = api_bpm_domain.uploadAttachmentJryModel("incident", vm.model.problem.id, '00000', $rootScope.user.id).getRequestedUrl();
+                                  //     item.formData.push({
+                                  //         'fileName': item.file.name
+                                  //     });
+                                  // };
+                                  // $scope.fileUploader.uploadAll();
+                                  $scope.fileUploader.onBeforeUploadItem =
+                                    function (item) {
+                                      angular.extend(
+                                        item.headers,
+                                        $rootScope.getSession()
+                                      );
+                                      item.url = api_bpm_domain
+                                        .uploadAttachment(
+                                          vm.model.incident.processInstanceId,
+                                          "00000",
+                                          $rootScope.user.id
+                                        )
+                                        .getRequestedUrl();
+                                      item.formData.push({
+                                        fileName: item.file.name,
+                                      });
+                                      //console.log();
+                                    };
+                                  $scope.fileUploader.uploadAll();
+                                } else if (vm.model.problem) {
+                                  $scope.fileUploader.onBeforeUploadItem =
+                                    function (item) {
+                                      angular.extend(
+                                        item.headers,
+                                        $rootScope.getSession()
+                                      );
+                                      item.url = api_bpm_domain
+                                        .uploadAttachmentJryModel(
+                                          "problem",
+                                          vm.model.problem.id,
+                                          "00000",
+                                          $rootScope.user.id
+                                        )
+                                        .getRequestedUrl();
+                                      item.formData.push({
+                                        fileName: item.file.name,
+                                      });
+                                    };
+                                  $scope.fileUploader.uploadAll();
+                                } else if (vm.model.change) {
+                                }
                               }
+                              $state.go($scope.formData.cancelUrl);
                             }
-                            $state.go($scope.formData.cancelUrl);
-                          }
-                        );
-                      } else {
-                        SweetAlert.swal({
-                          title: "系统错误",
-                          text: "系统错误，请稍后重试!",
-                          type: "error",
-                          confirmButtonColor: "#DD6B55",
-                        });
-                      }
-                      $scope.ldloading[style.replace("-", "_")] = false;
-                    });
+                          );
+                        } else {
+                          SweetAlert.swal({
+                            title: "系统错误",
+                            text: "系统错误，请稍后重试!",
+                            type: "error",
+                            confirmButtonColor: "#DD6B55",
+                          });
+                        }
+                        $scope.ldloading[style.replace("-", "_")] = false;
+                      });
                   }
                   break;
                 case "back":

assets/js/controllers/incident/incidentCtrl.js

@@ -5,6 +5,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     $scope.repairMain = JSON.parse(sessionStorage.getItem("repair_main"));
     $scope.wxIncidentWithCmdb = JSON.parse(sessionStorage.getItem("wxIncidentWithCmdb"));//资产
     $scope.incidentWithConsumable = JSON.parse(sessionStorage.getItem("incidentWithConsumable"));//耗材
+    $rootScope.isFuwutai = JSON.parse(localStorage.getItem("isFuwutai")) ? true : false;
     // ----------------分割线 start-----------------
     console.log($state)
     // 故障地点下拉
@@ -3015,16 +3016,19 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     //查看
     $scope.toDetail = function (data) {
         //console.log('data='+JSON.stringify(data));
-        console.log(data);
-        window.open(location.origin+'/#/app/incident/detail/incident_back/incident/'+data.id+'/'+data.taskId+'/'+data.processInstanceId+'//');
-        // $state.go('app.incident.detail', {
-        //     formKey: 'incident_back',
-        //     pdKey: 'incident',
-        //     dataId: data.id,
-        //     taskId: data.taskId,
-        //     processInstanceId: data.processInstanceId
-        // });
-
+        console.log(data,$rootScope.isFuwutai);
+        if($rootScope.isFuwutai){
+            //角色是服务台人员
+            $state.go('app.incident.detail', {
+                formKey: 'incident_back',
+                pdKey: 'incident',
+                dataId: data.id,
+                taskId: data.taskId,
+                processInstanceId: data.processInstanceId
+            });
+        }else{
+            window.open(location.origin+'/#/app/incident/detail/incident_back/incident/'+data.id+'/'+data.taskId+'/'+data.processInstanceId+'//');
+        }
     };
     //   $scope.play = function() {
     //     // console.log($scope.item.callID)

assets/js/controllers/knowledge/knowledgeCtrl.js

@@ -480,10 +480,10 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
                     id: 1,
                     name: "模版下载"
                 } 
-                // ,{
-                //     id: 2,
-                //     name: "数据导出"
-                // }
+                ,{
+                    id: 2,
+                    name: "数据导出"
+                }
                 ]
                 $scope.ok = function () {
                     $modalInstance.close($scope.key);