BUG修复

assets/js/controllers/incident/incidentCtrl.js

@@ -1036,10 +1036,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
     })
     //报修人
-    var getRequester = function () {
+    var getRequester = function (key='') {
         api_user_data.fetchDataList('requester', {
             idx: 0,
-            sum: 100
+            sum: 10,
+            "requester": {
+                "name": key,
+                'selectTypePys': "pinyin_qs"
+            }
         }).then(function (data) {
             // console.log(data);
             $scope.requester = data.list
@@ -1088,6 +1092,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         getUser(filuser, 2);
     }
+    //报修人过滤
+    $scope.onChangeRequester = function (key) {
+        getRequester(key);
+    }
 
     //报修科室过滤
     $scope.onChangeDept = function (key) {

assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -75,7 +75,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     //               $scope.outdata = response.list;
     //           }
     //       }
-    //   })    
+    //   })
     // }
     // $scope.refreshListData();
     $scope.filterTree = function (data,id) {
@@ -117,7 +117,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }else{
             $scope.subdata.hasPlace=false
         }
-        
+
         convertchildToTree(branch,'事件分类');
         console.log(branch)
         if(branch.managerUser){
@@ -156,7 +156,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             //   //Restangular.
             //    $scope.userdata = response.data;
             // });
-        }        
+        }
 
     };
     $scope.thisParent={};//当前点击节点的父节点
@@ -221,9 +221,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                     postData.typeList.push({ id: data.id });
                 })
             }
-        }        
+        }
     };
-   
+
     $scope.addType = function(element) {
             $scope.tree_data = $scope.dataSave.length?angular.copy($scope.dataSave):$scope.tree_data;
             $scope.addcate = true
@@ -232,8 +232,8 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                 //     templateUrl: 'assets/views/system/tpl/systemclose.html',
                 //     controller: function($scope, $modalInstance, api_bpm_data){
                 //         // api_bpm_data.fetchDataList('closecode',filterData).then(function(data){
-                //         // var myData = Restangular.stripRestangular(data);  
-                //         // }      
+                //         // var myData = Restangular.stripRestangular(data);
+                //         // }
                 //     }
                 // });
         }
@@ -434,7 +434,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     // $scope.parentdata = {};
     $scope.try_async_load = function() {
         $scope.my_data = [];
-        
+
         $scope.doing_async = true;
         var data = { "idx": 0, "sum": 1000 };
         api_bpm_data.fetchDataList('incidentcategory', data).then(function(response) {
@@ -489,7 +489,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     };
     $scope.try_async_1load = function() {
         $scope.my_1data = [];
-        
+
         $scope.doing_async = true;
         var data = { "idx": 0, "sum": 1000,inspectionType:{deleteFlag:0} };
         api_bpm_data.fetchDataList('inspectionType', data).then(function(response) {
@@ -532,7 +532,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         //     formdata.hasArea = 0;
         //     formdata.hasPlace = 0;
         // }
-        
+
         if (formdata.hasPlace==true) {
             formdata.hasPlace = 1;
         } else {
@@ -548,7 +548,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         //     formdata.parent = { "id": $scope.selectedTreeNode.parent.id };
         // }
         // console.log($scope.thisParent)
-        
+
          if($scope.selectedChangeCategory){
             formdata['parentCategory'] ={'id':$scope.selectedChangeCategory.id};
             delete formdata.parent
@@ -581,7 +581,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         var filedata = { "incidentcategory": formdata }
         console.log(filedata,$scope.userGroupChecked);
         // return;
-        api_bpm_data.updData('incidentcategory', filedata).then(function(response) {
+        api_user_data.updData('incidentcategory', filedata).then(function(response) {
             if (response) {
                 if (response.status == 200) {
                     $scope.try_async_load()
@@ -594,6 +594,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                 } else {
                     SweetAlert.swal({
                         title: "修改失败!",
+                        text: response.msg,
                         type: "error"
                     })
                 }
@@ -707,11 +708,11 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             formdata.handleUser={id:$scope.userGroupCheckedAdd.userCheck.id};
             // delete formdata.group;
         }
-        
+
         var filedata = { "incidentcategory": formdata }
         console.log(filedata);
         // return;
-        api_bpm_data.addData('incidentcategory', filedata).then(function(response) {
+        api_user_data.addData('incidentcategory', filedata).then(function(response) {
             if (response) {
                 if (response.status == 200) {
                     $scope.userdata = [];
@@ -721,15 +722,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                         title: "增加成功!",
                         type: "success"
                     })
-                } else if (response.status == 408) {
-                    SweetAlert.swal({
-                        title: "增加失败!",
-                        text: response.error,
-                        type: "error"
-                    })
                 } else {
                     SweetAlert.swal({
                         title: "增加失败!",
+                        text: response.msg,
                         type: "error"
                     })
                 }
@@ -787,7 +783,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         status: 0,
         pageIndex: 0,
         pageSum: 10,
-        //treeIds:'[]', 
+        //treeIds:'[]',
         userId: loginUser.id
     }
     // 事件分类结束
@@ -1373,7 +1369,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }
         $timeout(function(){
             $scope.getPrioritymatrix()
-        },2000)   
+        },2000)
     }
     $scope.removePrioritymatrix=function(data){
         SweetAlert.swal({
@@ -1410,16 +1406,16 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             } else {
                 SweetAlert.swal("操作取消", "数据安全", "error");
             }
-        });      
-    }    
+        });
+    }
     $scope.getPrioritymatrix()
     // 优先级规则结束
 
     // 获取组数据
     $scope.getGroupList=function(){
         var postData={
-            idx: 0, 
-            sum: 1000, 
+            idx: 0,
+            sum: 1000,
             group: {selectType: "nouser"}
         }
         api_user_data.fetchDataList('group',postData).then(res=>{
@@ -1431,10 +1427,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     // 获取人数据
     $scope.getUserList=function(){
         var postData={
-            idx: 0, 
-            sum: 1000, 
+            idx: 0,
+            sum: 1000,
             user: {
-                name:'', 
+                name:'',
                 selectType: "pinyin_qs",
             }
         }
@@ -1446,10 +1442,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     // 获取事件分类人员
     $scope.getUserList1=function(){
         var postData={
-            idx: 0, 
-            sum: 1000, 
+            idx: 0,
+            sum: 1000,
             user: {
-                name:'', 
+                name:'',
                 selectType: "pinyin_qs",
                 roledata:{
                     rolecode:'incident-category-manager'

assets/js/controllers/system/user/adminUserCtrl.js

@@ -1,5 +1,5 @@
 'use strict';
-/** 
+/**
  * controller for User Profile Example
  */
 app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$interval", "$modal", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_user_data", "api_login", function ($rootScope, $scope, $state, $timeout, $interval, $modal, SweetAlert, i18nService, uiGridConstants, uiGridGroupingConstants, Restangular, api_user_data, api_login) {
@@ -86,8 +86,8 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
 
     $scope.gridOptions.columnDefs = [{
             name: 'item',
-            displayName: '序号',
-            width: 50,
+            displayName: '#',
+            width: 30,
             enableFiltering: false,
             cellTemplate: '<div>' +
                 '<div class="ui-grid-cell-contents">{{row.entity.item}}</div>' +
@@ -96,29 +96,25 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
         {
             name: 'account',
             displayName: '账号',
-            width: '8%',
-            minWidth: '105',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'name',
             displayName: '姓名',
-            width: '6%',
-            minWidth: '100',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'weixin',
             displayName: '微信',
-            width: '6%',
-            minWidth: '120',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'userType',
             displayName: '人员类别',
-            width: '6%',
-            minWidth: '120',
+            width: 100,
             enableFiltering: false,
             cellTemplate: '<div>' +
                 '<div class="ui-grid-cell-contents">{{row.entity.userType.value == 2 ?row.entity.company.name:row.entity.userType.name}}</div>' +
@@ -133,53 +129,51 @@ app.controller('adminUserListCtrl', ["$rootScope", "$scope", "$state", "$timeout
         {
             name: 'phone',
             displayName: '联系电话',
-            width: '8%',
-            minWidth: '115',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'email',
             displayName: '邮箱',
-            width: '14%',
-            minWidth: '150',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'dept.dept',
             displayName: '科室',
-            width: '12%',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'dept.phone',
             displayName: '科室电话',
-            width: '11%',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'extensionNo',
             displayName: '分机号码',
-            width: '11%',
+            width: 100,
             enableFiltering: false
         },
         {
             name: 'group',
             displayName: '所属工作组',
-            width: '15%',
-            minWidth: '150',
+            width: 150,
             cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transfergroup(row.entity.group)}}</div>',
             enableFiltering: false
         },
         {
             name: 'flag',
             displayName: '状态',
+            width: 100,
             cellTemplate: '<div class="ui-grid-cell-contents">{{grid.appScope.transferStatus(row.entity.flag)}}</div>',
             width: '5%',
             enableFiltering: false
         },
         {
             name: '操作',
-            minWidth: '150',
+            width: 150,
             cellTemplate: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left">' +
                 // '<a  ng-click="grid.appScope.saveData(row.entity)" tooltip="编辑" tooltip-placement="right">' +
                 // '<i class="fa fa-pencil-square-o"/></a>' +

assets/views/incident/list.html

@@ -89,7 +89,7 @@
                                         {{$select.selected.name}}
                                     </ui-select-match>
                                     <ui-select-choices repeat="item in requester"
-                                        refresh="onChangehandling($select.search)">
+                                        refresh="onChangeRequester($select.search)">
                                         <div ng-bind-html="item.name | highlight: $select.search"></div>
                                     </ui-select-choices>
                                 </ui-select>
@@ -418,7 +418,7 @@
         height: 28px;
     }
 
-    /* 
+    /*
     .wt_width {
         width: 20%;
         margin-right: 1%;