呼叫中心功能开发完成

assets/js/controllers/incident/incidentCtrl.js

@@ -2189,7 +2189,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                                 groupdata:{id:groupId},
                                 roledata: { rolecode: "first-line support" },
                                 roledata2: { rolecode: "second-line support" },
-                                selectType: "1"
+                                selectType: "1",
+                                selectDetails:1
                             }
                         }
                     }else{
@@ -2199,7 +2200,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                             user: {
                                 roledata: { rolecode: "first-line support" },
                                 roledata2: { rolecode: "second-line support" },
-                                selectType: "1"
+                                selectType: "1",
+                                selectDetails:1
                             }
                         }
                     }

assets/js/controllers/mainCtrl.js

@@ -4,6 +4,7 @@
  */
 app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$window', '$modal', '$document', '$timeout', '$filter', '$auth', 'cfpLoadingBar', 'DDP', 'deskNotification', 'Restangular', 'api_login', 'api_text', 'api_user_data', 'api_wechatfile', 'api_bpm_data', 'api_msg', 'Myservice', '$interval', 'jry_api_bpm',
   function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $window, $modal, $document, $timeout, $filter, $auth, cfpLoadingBar, DDP, deskNotification, Restangular, api_login, api_text, api_user_data, api_wechatfile, api_bpm_data, api_msg, Myservice, $interval, jry_api_bpm) {
+    
     // 未读消息数量seimin
     $rootScope.getMsgNum = function (id) {
       api_msg.msgDataList({ idx: 0, sum: 1, messageStation: { readStatus: 0, userId: id } }).then(function (data) {
@@ -44,6 +45,24 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // $auth.deleteData('auth_headers')
     // }
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
+      console.log(event, toState, toParams, fromState, fromParams,'cao')
+      if((toState.name == 'app.incident.editor'||toState.name == 'app.incident.editor')&&
+      fromState.name){
+        $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
+        //进入页面强制示忙
+        if(tlwsa){
+          tlwsa.tlaForceacw($rootScope.phoneNumber);
+        }
+      }
+      if((fromState.name == 'app.incident.editor'||fromState.name == 'app.incident.editor')&&
+      toState.name != 'app.incident.editor'&&toState.name != 'app.incident.editor'
+      ){
+        $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
+        //进入页面强制示闲
+        if(tlwsa){
+          tlwsa.tlaForcewca($rootScope.phoneNumber);
+        }
+      }
       if (isEmpty($auth.retrieveData('auth_headers'))) {
         // if (toState.name != "login.signin" && toState.name != "echart") {
         //     event.preventDefault();
@@ -1273,330 +1292,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_extnNumberObj.tel2 = angular.copy(res[0]);//转接坐席对象
         //连接
         tlwsa.tlaOpen(websocket_url);
-        /* callbacks */
-        function onMessage(evt) {
-          var phoneData = JSON.parse(evt.data);
-          if (phoneData.event_type == "agent_state") {
-            console.log(phoneData);
-            if (phoneData.state == "busy") {
-              $('#agent_state').append(" (" + phoneData.private_data + ")");
-              // 来电
-              if (phoneData.private_data == "ring") {
-                console.log(phoneData);
-                $rootScope.jry_state = "laidian";
-                var Notification = window.Notification;
-                Notification.requestPermission();
-                var n = new Notification("你有来电", {
-                  body: "来电号码：" + phoneData.ani,
-                  icon: '../bower_components/HTML5-Desktop-Notifications/alert.ico',
-                });
-                // 摘机
-              } else if (phoneData.private_data == "answered") {
-                $rootScope.jry_state = "tonghuazhong";
-                var jry_findPhone = "";
-                if (phoneData.ani) {
-                  jry_findPhone = phoneData.ani
-                } else if (phoneData.dnis && phoneData.other_answered) {
-                  jry_findPhone = phoneData.dnis
-                }
-                var filterData = {
-                  "idx": 0,
-                  "sum": 100,
-                  "requester": {
-                    "mphone": jry_findPhone,
-                    "telephone": jry_findPhone,
-                    "selectType": 1
-                  }
-                }
-                api_user_data.fetchDataList('requester', filterData).then(function (data) {
-                  var myData = Restangular.stripRestangular(data);
-                  // $rootScope.phone="";
-                  // 新增报修人baba
-                  if (myData.list.length == 0) {
-                    var modalInstance = $modal.open({
-                      templateUrl: 'assets/views/customform/tpl/modal-add-callrequester.html',
-                      controller: function ($scope, $modalInstance, api_user_data, SweetAlert, api_wechatfile) {
-                        $scope.title = "新增报修人";
-                        $scope.requester = {};
-                        $scope.onChangeadd = function (searchData) {
-                          $scope.searchKey = searchData.account;
-                          // $scope.searchDataadd = searchData;
-                          var requesdata = angular.copy(searchData)
-                          // if (requesdata.mphone) {
-                          //     delete requesdata.mphone;
-                          // }
-                          if (requesdata.telephone) {
-                            delete requesdata.telephone;
-                          }
-                          angular.extend($scope.requester, requesdata);
-                        }
-                        $scope.refreshUseradd = function (searchKey) { //请求人搜索
-                          $scope.requester.account = searchKey;
-                          $scope.searchData = searchKey;
-                          serchdataadd(searchKey);
-                        }
-                        $scope.getMydata = function (x) {
-                          var reqestdatap = JSON.parse(x[0])
-                          // if ($scope.requester.mphone) {
-                          //     delete reqestdatap.mphone;
-                          // }
-                          if ($scope.requester.telephone) {
-                            delete reqestdatap.telephone;
-                          }
-                          $scope.searchField = JSON.parse(x[0]).account;
-                          angular.extend($scope.requester, reqestdatap);
-                        }
-                        $scope.getMydataone = function (x) {
-                          $scope.searchField = x;
-                          $scope.requester.account = x;
-                        }
-                        serchdataadd();
-
-                        function serchdataadd(searchKey) {
-                          if (searchKey) {
-                            var filterData = {
-                              'requester': {
-                                'searchKey': searchKey,
-                              },
-                              idx: 0,
-                              sum: 10
-                            };
-                          } else {
-                            var filterData = {
-                              idx: 0,
-                              sum: 10
-                            };
-                          }
-                          api_user_data.fetchDataList('requester', filterData).then(function (response) {
-                            var myData = response;
-                            $scope.myData = myData.list;
-                          });
-                        }
-                        api_user_data.fetchDataList('area', {
-                          idx: 0,
-                          sum: 100
-                        }).then(function (response) {
-                          if (response.status == 200) {
-                            $scope.areas = response.list;
-                          }
-                        })
-                        api_wechatfile.getDictionary({
-                          "key": "requester_type",
-                          "type": "list"
-                        }).then(function (response) {
-                          // if (response.status == 200) {
-                          $scope.networktypes = response;
-                          // }
-                        })
-                        $scope.requesterAreaid = "";
-                        $scope.onChange = function (item) {
-                          $scope.requesterAreaid = item.id;
-                          $scope.requester.placeDTO = {};
-                          api_user_data.fetchDataList('place', {
-                            place: {
-                              areaId: item.id
-                            },
-                            idx: 0,
-                            sum: 1000
-                          }).then(function (response) {
-                            if (response.status == 200) {
-                              $scope.places = response.list;
-                            }
-                          })
-                        }
-                        //地点搜索
-                        $scope.refresh = function (searchVal) {
-                          var faildata = {};
-                          if ($scope.requesterAreaid) {
-                            faildata = {
-                              'idx': 0,
-                              'sum': 1000,
-                              'place': {
-                                'areaId': $scope.requesterAreaid,
-                                'place': searchVal,
-                                'selectType': 'pinyin_qs'
-                              }
-                            }
-                          } else {
-                            faildata = {
-                              'idx': 0,
-                              'sum': 1000,
-                              'place': {
-                                'place': searchVal,
-                                'selectType': 'pinyin_qs'
-                              }
-                            }
-                          }
-                          api_user_data.fetchDataList('place', faildata).then(function (response) {
-                            $scope.places = response.list;
-                            delete $scope.requester.placeDTO;
-                          })
-                        }
-
-
-                        $scope.requester = {
-                          'telephone': jry_findPhone
-                        };
-                        $scope.ok = function () {
-                          var reg1 = /^1[3456789][0-9]{9}$/; //手机号
-                          var reg2 = /^((0\d{2,3})-)*(\d{7,8})(-(\d{3,}))?$/; //座机号
-                          var flag1 = reg1.test($scope.requester.mphone);
-                          var flag2 = reg2.test($scope.requester.mphone);
-                          console.log($scope.requester)
-                          if (angular.isUndefined($scope.requester.name) || $scope.requester.name == null || $scope.requester.name == "") {
-                            SweetAlert.swal("报修人姓名未填!", "请填写报修人姓名", "error");
-                          } else if (angular.isUndefined($scope.requester.requesterType)) {
-                            SweetAlert.swal("人员类型未填!", "请填写人员类型", "error");
-                          } else if (angular.isUndefined($scope.requester.mphone) || $scope.requester.mphone == null || $scope.requester.mphone == "") {
-                            SweetAlert.swal("报修人电话未填!", "请填写报修人电话", "error");
-                          }
-                          else {
-                            $modalInstance.close($scope.requester);
-                          }
-                        };
-
-                        $scope.cancel = function () {
-                          $modalInstance.dismiss('cancel');
-                        };
-                      },
-                    });
-                    modalInstance.result.then(function (selectedItem) {
-                      if (selectedItem) {
-                        if (selectedItem.telephone && !selectedItem.mphone) {
-                          selectedItem.telephone = angular.copy(selectedItem.mphone);
-                          delete selectedItem.mphone;
-                        }
-                        var data = {
-                          'requester': selectedItem
-                        };
-                        api_user_data.addData('requester', data).then(function (response) {
-                          if (response.status == 200) {
-                            var data = {
-                              'model': {
-                                'requestershow': response.data,
-                                'incident': {
-                                  'requester': response.data,
-                                  'area': response.data.areaDTO,
-                                  'place': response.data.placeDTO,
-                                  'houseNumber': response.data.houseNumber,
-                                  // 'callID': cdrid,
-                                  'source': {
-                                    'id': 1547
-                                  }
-                                }
-                              }
-                            }
-                            $state.go('app.incident.title', {
-                              'model': JSON.stringify(data)
-                            });
-                          }
-                        })
-                      }
-                    });
-                  } else if (myData.list.length == 1) {
-                    var data = {
-                      'model': {
-                        'requestershow': myData.list[0],
-                        'incident': {
-                          'requester': myData.list[0],
-                          'area': myData.list[0].areaDTO,
-                          'place': myData.list[0].placeDTO,
-                          'houseNumber': myData.list[0].houseNumber,
-                          // 'callID': cdrid,
-                          'source': {
-                            'id': 1547
-                          }
-                        }
-                      }
-                    }
-                    $state.go('app.incident.title', {
-                      'model': JSON.stringify(data)
-                    });
-                  } else {
-                    var modalInstance = $modal.open({
-                      templateUrl: 'assets/views/createincident.html',
-                      controller: function ($scope, $modalInstance, api_user_data) {
-                        $scope.title = "请确定报修人";
-                        $scope.requester = myData.list;
-                        $scope.choice = function (requester) {
-                          $modalInstance.dismiss('cancel');
-                          var data = {
-                            'model': {
-                              'requestershow': requester,
-                              'incident': {
-                                'requester': requester,
-                                'area': requester.areaDTO,
-                                'place': requester.placeDTO,
-                                'houseNumber': requester.houseNumber,
-                                // 'callID': cdrid,
-                                'source': {
-                                  'id': 1547
-                                }
-                              }
-                            }
-                          }
-                          $state.go('app.incident.title', {
-                            'model': JSON.stringify(data)
-                          });
-                        };
-
-                        $scope.cancel = function () {
-                          $modalInstance.dismiss('cancel');
-                        };
-                      },
-                      size: "lg"
-                    });
-                  }
-
-                });
-              }
-              // 挂机
-            } else if (phoneData.state == "login") {
-              go_ready()
-            } else if (phoneData.state == "logout") {
-              $rootScope.jry_state = "weiqianru";
-            } else if (phoneData.state == "ready") {
-              // 来电挂机
-              if (phoneData.old_state == "busy" && phoneData.private_data == "answered") {
-                go_break()
-              } else {
-                $rootScope.jry_state = "shixian";
-              }
-            }
-            // else if (data.old_state == "busy") {
-
-            // }
-          } else if (phoneData.event_type == "agent_caller_state") {
-            // special feature, never mind
-            if (phoneData.action == "in") {
-
-            } else {
-
-            }
-          } else if (phoneData.event_type == "command/reply") {
-            if (phoneData.phoneData && phoneData.phoneData.state) {
-
-            }
-          }
-        }
-        // $modal.open({
-        //     template:' ',
-        //     controller: function ($scope,$modalInstance,SweetAlert){
-        //         SweetAlert.swal({
-        //             title: "呼叫失败",
-        //             text: "呼叫失败!",
-        //             type: "error"
-        //         },function(){
-        //             $modalInstance.close('cancel')
-        //         })
-        //     }
-        // })
         //连接呼叫中心回调函数
         TLWSA.onOpenreturn = onopenreturn;
         function onopenreturn(err) {
           err = Number(err);
           if (!err) {
             console.log('呼叫中心连接成功-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼叫中心连接成功'
+            });
             //如果设置过话机
             if (localStorage.getItem('phoneNumber')) {
               // 签入并绑定分机
@@ -1615,13 +1321,57 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             console.log('绑定分机成功-----seimin');
             $rootScope.jry_state = 'shixian';
             localStorage.setItem('phoneNumber', $rootScope.phoneNumber);
+            if(location.href.includes('app/incident/editor')||location.href.includes('app/incident/chart')){
+              //进入页面,强制示忙
+              tlwsa.tlaForceacw($rootScope.phoneNumber);
+            }
           } else {
             console.log('绑定分机失败-----seimin');
           }
         }
+        //强制示忙回调函数
+        TLWSA.onAcw=onacw;
+        function onacw(err) {
+          err = Number(err);
+          if (!err) {
+            $rootScope.jry_state = 'shimang';
+            console.log('强制示忙成功-----seimin');
+          }else{
+            console.log('强制示忙失败-----seimin');
+          }
+        }
+        //强制示闲回调函数
+        TLWSA.onWca = onwca;
+        function onwca(err) {
+          console.log(err)
+          err = Number(err);
+          if (!err) {
+            $rootScope.jry_state = 'shixian';
+            console.log('强制示闲成功-----seimin');
+          }else{
+            console.log('强制示闲失败-----seimin');
+          }
+        }
+        //与服务器网络连接中断回调函数
+        TLWSA.onClosed=onclosed;
+        function onclosed() {
+          $rootScope.jry_state = 'weiqianru';
+          console.log('与服务器网络连接中断-----seimin');
+          $.toaster({
+            priority: 'info',
+            title: '操作',
+            message: '与服务器网络连接中断,2分钟后重连'
+          });
+          console.log('2分钟后自动重连-----seimin')
+          $timeout(function(){
+            //连接
+            tlwsa.tlaOpen(websocket_url);
+          },120000)
+        }
         //签入回调函数
         TLWSA.onLoginreturn = onloginreturn;
         function onloginreturn(err) {
+          console.log(err)
           err = Number(err);
           if (!err) {
             console.log('签入成功-----seimin');
@@ -1728,36 +1478,35 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           if (!err) {
             console.log('呼入摘机应答成功-----seimin');
             $rootScope.jry_state = 'tonghuazhong';
-            //根据电话号码反查报修人
-            var postData = { "idx": 0, "sum": 10, "requester": { hjzxPhone: $rootScope.callInPhoneNumber } };
+            //根据电话号码反查报修人hjzxPhone
+            var postData = { "idx": 0, "sum": 10, "requester": { mphone: $rootScope.callInPhoneNumber } };
             api_user_data.fetchDataList('requester', postData).then(function (result) {
               if (result.status == 200) {
                 console.log(result.list);
                 var requesters = result.list;
+
                 
-                $state.go('app.incident.chart',{
-                  model: JSON.stringify({
-                    model:{
-                      incident:{
-                        requester:{
-                          hjzxPhone:$rootScope.callInPhoneNumber
-                        }
-                      }
-                    }
-                  })
-                });
-                return;
                 if (requesters.length === 0) {
                   //未匹配到报修人，则弹窗添加报修人yeye
-                  
+                  $state.go('app.incident.chart', {
+                    model: JSON.stringify({
+                      model: {
+                        incident: {
+                          requester: {
+                            hjzxPhone: $rootScope.callInPhoneNumber
+                          }
+                        }
+                      }
+                    })
+                  });
                 } else if (requesters.length === 1) {
                   //匹配到一个报修人
-                  $state.go('app.incident.chart',{
+                  $state.go('app.incident.chart', {
                     model: JSON.stringify({
-                      model:{
+                      model: {
                         incident: {
                           requester: requesters[0],
-                          contactsInformation:requesters[0].mphone
+                          contactsInformation: requesters[0].mphone
                         },
                       }
                     })
@@ -1765,17 +1514,39 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                 } else {
                   //匹配到多个报修人
                   $modal.open({
-                    template:' ',
-                    controller: function ($scope,$modalInstance,SweetAlert){
-                        SweetAlert.swal({
-                            title: "呼叫失败",
-                            text: "呼叫失败!",
+                    templateUrl: 'assets/views/incident/tpl/tel.html',
+                    controller: function ($scope, $modalInstance,$timeout,SweetAlert) {
+                      $scope.list = requesters;
+                      $scope.selectedItem = 0;
+                      $scope.cancel = function () {
+                        $modalInstance.dismiss('cancel');
+                      };
+                      $scope.changeBxr = function(id){
+                        $scope.selectedItem = id;
+                      }
+                      $scope.save = function () {
+                        var item = $scope.list.find(v => v.id == $scope.selectedItem);
+                        if (item) {
+                          $scope.cancel();
+                          $state.go('app.incident.chart', {
+                            model: JSON.stringify({
+                              model: {
+                                incident: {
+                                  requester: item,
+                                  contactsInformation: item.mphone
+                                },
+                              }
+                            })
+                          });
+                        }else{
+                          SweetAlert.swal({
+                            title: "请选择报修人!",
                             type: "error"
-                        },function(){
-                            $modalInstance.close('cancel')
-                        })
+                          })
+                        }
+                      }
                     }
-                })
+                  });
                 }
               }
             })
@@ -1826,6 +1597,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             });
           }
         }
+        
         // 签入
         $rootScope.jry_qianru = function () {
           // 签入并绑定分机

assets/js/directives/ola_api2.js

@@ -73,15 +73,15 @@ TLWSA.onConferencechangememberstatereturn=onconferencechangememberstatereturn;
 //主动事件
 // TLWSA.onCallin=oncallin;
 // TLWSA.onCallend=oncallend;
-TLWSA.onAcw=onacw;
-TLWSA.onWca = onwca;
+// TLWSA.onAcw=onacw;
+// TLWSA.onWca = onwca;
 TLWSA.onLogoff = onlogoff; //被强制注销事件
 // TLWSA.onCallresult=oncallresult;
 // TLWSA.onTransferresult=ontransferresult;
 TLWSA.onConsulttransfercalleeanswer=onconsulttransfercalleeanswer;
 TLWSA.onBlindtransferresult=onblindtransferresult;
 // TLWSA.onAnswer=onanswer;
-TLWSA.onClosed=onclosed;
+// TLWSA.onClosed=onclosed;
 TLWSA.onSlaveserverclosed=onslaveserverclosed; //备用服务器网络中断
 TLWSA.onHoldcallreleased=onholdcallreleased;
 TLWSA.onKeepcallreleased=onkeepcallreleased;
@@ -284,14 +284,14 @@ function onconferencechangememberstatereturn(jso)
 // {
 // 	console.log('事件:通话结束' + JSON.stringify(jso));
 // }
-function onacw()
-{
-	console.log('事件:你已经进入离席状态');
-}
-function onwca()
-{
-	console.log('事件:你已经进入就绪状态');
-}
+// function onacw()
+// {
+// 	console.log('事件:你已经进入离席状态');
+// }
+// function onwca()
+// {
+// 	console.log('事件:你已经进入就绪状态');
+// }
 function onlogoff() //被动注销事件（网络中断 / 被踢）
 {
     console.log('事件:您已经被注销');
@@ -312,21 +312,21 @@ function onblindtransferresult(err) {
 // function onanswer(err) {
 //     console.log('事件:应答'+err);
 // }
-function onclosed(err) {
-    log('事件:与服务器的网络连接中断');
-}
+// function onclosed(err) {
+//     console.log('事件:与服务器的网络连接中断');
+// }
 function onslaveserverclosed(err)
 {
-	log('事件:与备用服务器的网络连接中断');
+	console.log('事件:与备用服务器的网络连接中断');
 }
 function onholdcallreleased(err) {
-    log('事件:被保持的对方已挂机');
+    console.log('事件:被保持的对方已挂机');
 }
 function onkeepcallreleased(err) {
-    log('事件:转回ivr并等待的外线已挂机');
+    console.log('事件:转回ivr并等待的外线已挂机');
 }
 function oncalleealerting(err) {
-    log('事件:呼叫的外线已经开始振铃');
+    console.log('事件:呼叫的外线已经开始振铃');
 }
 function onqueue(crs,caller,callee,data)
 {
@@ -334,13 +334,13 @@ function onqueue(crs,caller,callee,data)
 }
 function onstatechange()
 {
-	log('事件:状态变化----------------------------------------------------');
+	console.log('事件:状态变化----------------------------------------------------');
 	queryAgentState();
 }
 function onmystatechange(jso)
 {
-	log('事件:状态变化----------------------------------------------------');
-	log(JSON.stringify(jso));
+	console.log('事件:状态变化----------------------------------------------------');
+	console.log(JSON.stringify(jso));
 }
 function onquitqueue(crs)
 {

assets/views/dashboard/newdash.html

@@ -275,7 +275,7 @@
                     </div> -->
                 <!-- </div> -->
                 <div class="know-text-group clearfix">
-                    <div class="know-text-group_block fr">
+                    <div class="know-text-group_block fr" style="font-size: 16px;">
                         <div class="know-text-group_item fl">实时工单情况<strong></strong></div>
                         <div class="know-text-group_item fl">今日建单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                         <div class="know-text-group_item fl">所有待接单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',state:'1543'})">{{managerIndexInfo.waitOrders}}</strong></div>

assets/views/incident/tpl/tel.html

@@ -0,0 +1,35 @@
+<style>
+    .modal-dialog {
+        height: 100vh;
+    }
+
+    .modal-dialog .new_after {
+        position: fixed;
+    }
+    .hj .body .rigt .div{
+        height: 100px!important;
+    }
+</style>
+<div class="new new_after hj">
+    <div class="head">
+        <span>选择报修人</span>
+        <span class="jiaocha" ng-click="close()">×</span>
+    </div>
+    <div class="body">
+        <div class="xing">
+            <div>*</div>
+        </div>
+        <form class="rigt">
+            <div class="div">
+                <div class="tab_bdItem_tab" ng-repeat="item in list">
+                    <input type="radio" ng-model="selectedItem" ng-change="changeBxr(item.id)" name="selectedItem" ng-value="item.id" id="{{item.id}}">
+                    <label for="{{item.id}}">{{item.name}}</label>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="submi ">
+        <input type="button" value="保存" class="preservation btn" ng-click="save()">
+        <input type="button" value="取消" class="cancel btn" ng-click="cancel()">
+    </div>
+</div>

assets/views/incident/tpl/toAssign.tpl.html

@@ -5,12 +5,12 @@
     </div>
 </div>
 <div class="modal-body center">
-    <div class="form-group incidentsearch" style="margin:0 auto;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 380px;">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">工作组</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:130px" ng-model="assignGroup" theme="bootstrap" ng-change="onChangeRotateGroup($select.selected)">
+                <ui-select class="pull-left" style="width:310px" ng-model="assignGroup" theme="bootstrap" ng-change="onChangeRotateGroup($select.selected)">
                     <ui-select-match placeholder="">
                         {{$select.selected.groupName}}
                     </ui-select-match>
@@ -21,17 +21,17 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 380px;">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">指派对象</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:130px" ng-model="assignUser" theme="bootstrap" ng-change="onChangeRotateUser($select.selected)">
+                <ui-select class="pull-left" style="width:310px" ng-model="assignUser" theme="bootstrap" ng-change="onChangeRotateUser($select.selected)">
                     <ui-select-match placeholder="">
-                        {{$select.selected.name}}
+                        {{$select.selected.userTaskCount}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in user | filter:{$:$select.search}">
-                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                        <div ng-bind-html="item.userTaskCount | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
             </div>
@@ -41,4 +41,9 @@
 <div class="modal-footer modelfooter-hint pointfont">
     <div class="hintfooterleft pull-left" ng-click="ok()" translate="modal.button.OK ">OK</div>
     <div class="hintfooterright pull-right" ng-click="cancel() " translate="modal.button.CANCEL ">Cancel</div>
-</div>
+</div>
+<style>
+    .modal-dialog{
+        width: 450px!important;
+    }
+</style>