666

assets/js/controllers/customform/customformCtrl.js

@@ -11022,11 +11022,11 @@ appFormly.config(function config(formlyConfigProvider) {
                 scope.$root.selecthouseNumber = selectedItem.place
                   ? selectedItem.place
                   : {};
-                options.templateOptions.ApiService.addData(
-                  "requester",
-                  data
-                ).then(function (response) {
-                  if (response.status == 200) {
+                // options.templateOptions.ApiService.addData(
+                //   "requester",
+                //   data
+                // ).then(function (response) {
+                //   if (response.status == 200) {
                     if (scope.$parent.$parent.$parent) {
                       if (scope.$parent.$parent.$parent.place) {
                         scope.$parent.$parent.$parent.place.id = "";
@@ -11054,9 +11054,9 @@ appFormly.config(function config(formlyConfigProvider) {
                         scope.$parent.$parent.$parent.model.incident.priority.id = 2;
                       }
                     }
-                    if (!response.data.id) {
-                      response.data.id = selectedItem.id;
-                    }
+                    // if (!response.data.id) {
+                    //   response.data.id = selectedItem.id;
+                    // }
                     console.log(scope);
                     // if (scope.$parent.$parent.$parent.model.saveAgain) {
                     //     if (selectedItem.place && selectedItem.place.id) {
@@ -11087,8 +11087,8 @@ appFormly.config(function config(formlyConfigProvider) {
                       ] = true;
                     }, 500);
                     // }
-                  }
-                });
+                  // }
+                // });
               }
               //新建事件，选择派单，选择工作组查找处理人baba
               if (key == "handlerUser") {

assets/js/controllers/customform/customformDetailCtrl.js

@@ -82,6 +82,9 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
                 if (field.templateOptions.modelreasondata) {
                     datakey = field.templateOptions.modelreasondata
                 }
+                if (field.templateOptions.modelPlace) {
+                    datakey.place = {areaId:field.model.area.id}
+                }
 
                 process.customPOST(datakey, field.templateOptions.optionsUrl).then(function(result) {
                     if (!field.templateOptions.options) {

assets/js/controllers/mainCtrl.js

@@ -1299,6 +1299,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_extnNumberSelect = [];
         $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]);//转接坐席对象
@@ -1410,6 +1411,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               message: '绑定分机成功'
             });
             localStorage.setItem('phoneNumber', $rootScope.phoneNumber);
+            localStorage.setItem('fenjiNumber', $rootScope.jry_extnNumberObj.jry_extnNumber.name);
             $scope.qShimang(1);
           } else {
             console.log('绑定分机失败-----seimin');
@@ -1492,8 +1494,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               message: '签入成功'
             });
             setTimeout(function () {
-              console.log('开始绑定分机【' + $rootScope.phoneNumber + '】-----seimin');
-              tlwsa.tlaSetphonenumber($rootScope.phoneNumber);
+              var fenjiNumber = $rootScope.jry_extnNumberObj.jry_extnNumber.name || localStorage.getItem('fenjiNumber');
+              console.log('开始绑定分机【' + fenjiNumber + '】-----seimin');
+              tlwsa.tlaSetphonenumber(fenjiNumber);
             }, 0)
           } else if (err == 9011) {
             console.log('签入失败，该分机已登录-----seimin');
@@ -1869,8 +1872,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         // 签入
         $rootScope.jry_qianru = function () {
           // 签入并绑定分机
-          tlwsa.tlaLogin($rootScope.jry_extnNumberObj.jry_extnNumber.name, 1, -1);
-          $rootScope.phoneNumber = $rootScope.jry_extnNumberObj.jry_extnNumber.name;
+          // $rootScope.jry_extnNumberObj.jry_extnNumber.name 分机号
+          // $rootScope.user.id  坐席号（用户id）
+          tlwsa.tlaLogin($rootScope.user.id, 1, -1);
+          $rootScope.phoneNumber = $rootScope.user.id;
         }
         // 示闲
         $rootScope.jry_shixian = function () {

assets/views/report/service_form.html

@@ -144,7 +144,7 @@
                                         </th>
                                         <th style="width:11%" ng-click="tableSort('unp_total')">
                                             <strong>
-                                                处理工单数
+                                                派单处理工单数
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'unp_totaltop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'unp_totalbottom'}"></i>