指派根据组筛选

assets/css/styles.css

@@ -12219,7 +12219,7 @@ fieldset[disabled] .btn-gray.active {
 /*新增按钮*/
 
 .ui-select-multiple.ui-select-bootstrap {
-    height: 30px;
+    height: auto;
     padding: 3px 3px 0;
 }
 

assets/js/controllers/incident/incidentCtrl.js

@@ -2167,22 +2167,54 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             templateUrl: 'assets/views/incident/tpl/toAssign.tpl.html',
             controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
                 console.log(model,loginUser);
+                //获取组下面的用户
+                $scope.getUsers = function(groupId){
+                    var postData = {};
+                    if(groupId){
+                        postData = {
+                            "idx": 0,
+                            "sum": 100,
+                            user: {
+                                groupdata:{id:groupId},
+                                roledata: { rolecode: "first-line support" },
+                                roledata2: { rolecode: "second-line support" },
+                                selectType: "1"
+                            }
+                        }
+                    }else{
+                        postData = {
+                            "idx": 0,
+                            "sum": 100,
+                            user: {
+                                roledata: { rolecode: "first-line support" },
+                                roledata2: { rolecode: "second-line support" },
+                                selectType: "1"
+                            }
+                        }
+                    }
+                    api_user_data.fetchDataList('user', postData).then(function (data) {
+                        $scope.user = data.list;
+                    })
+                }
                 $scope.assignUser = null;
                 $scope.user = [];
-                api_user_data.fetchDataList('user', {
+                $scope.group = [];
+                $scope.getUsers();
+                api_user_data.fetchDataList('group', {
                     "idx": 0,
                     "sum": 100,
-                    user: {
-                        roledata: { rolecode: "first-line support" },
-                        roledata2: { rolecode: "second-line support" },
-                        selectType: "1"
-                    }
+                    group: {}
                 }).then(function (data) {
-                    $scope.user = data.list;
+                    $scope.group = data.list;
                 })
                 $scope.onChangeRotateUser = function(item){
                     $scope.assignUser = item.id;
                 }
+                $scope.onChangeRotateGroup = function(item){
+                    $scope.assignGroup = item.id;
+                    $scope.getUsers(item.id)
+                }
+                
                 $scope.ok = function () {
                     if (!$scope.assignUser){
                         Alert.swal({

assets/js/controllers/system/thirdPartyCompanyCtrl.js

@@ -193,7 +193,7 @@ app.controller('thirdPartyCompanyCtrl', ["$rootScope", "$scope", "$state", "$tim
                         } else {
                             SweetAlert.swal({
                                 title: "无法删除!",
-                                text: "【"+response.data[0].name+"】已经绑定了用户！",
+                                text: "【"+response.data[0].name+"】已经绑定了用户或耗材！",
                                 type: "error"
                             });
                         }

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

@@ -6,7 +6,23 @@
 </div>
 <div class="modal-body center">
     <div class="form-group incidentsearch" style="margin:0 auto;">
-        <div class=" input-group" style="margin:30px 0 ;">
+        <div class=" input-group" style="margin:8px 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-match placeholder="">
+                        {{$select.selected.groupName}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in group | filter:{$:$select.search}">
+                        <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;">
+        <div class=" input-group" style="margin:8px 0 ;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">指派对象</label>:</div>
             <div class="pull-right">