瀏覽代碼

处理人查询修改

seimin 1 年之前
父節點
當前提交
753595bf49

+ 3 - 0
assets/js/controllers/businessConfiguration/deptBindUserCtrl.js

@@ -406,6 +406,7 @@ app.controller("deptBindUserCtrl", [
406 406
                 simple: true,
407 407
                 name: key,
408 408
                 selectType: "pinyin_qs",
409
+                engineer: 1,
409 410
               },
410 411
             };
411 412
             api_user_data.fetchDataList("user", userData).then(function (data) {
@@ -843,6 +844,7 @@ app.controller("deptBindUserCtrl", [
843 844
                 simple: true,
844 845
                 name: key,
845 846
                 selectType: "pinyin_qs",
847
+                engineer: 1,
846 848
               },
847 849
             };
848 850
             api_user_data.fetchDataList("user", userData).then(function (data) {
@@ -1313,6 +1315,7 @@ app.controller("deptBindUserCtrl", [
1313 1315
                 simple: true,
1314 1316
                 name: key,
1315 1317
                 selectType: "pinyin_qs",
1318
+                engineer: 1,
1316 1319
               },
1317 1320
             };
1318 1321
             api_user_data.fetchDataList("user", userData).then(function (data) {

+ 17 - 3
assets/js/controllers/customform/customformCtrl.js

@@ -1788,6 +1788,9 @@ appFormly.config(function config(formlyConfigProvider) {
1788 1788
                   idx: 0,
1789 1789
                   sum: 1000,
1790 1790
                   flag: -1,
1791
+                  user: {
1792
+                    engineer: 1,
1793
+                  }
1791 1794
                 })
1792 1795
                 .then(function (data) {
1793 1796
                   $scope.handlingPersonnelUser = data.list;
@@ -8465,11 +8468,12 @@ appFormly.config(function config(formlyConfigProvider) {
8465 8468
                 var data = {
8466 8469
                   idx: "0",
8467 8470
                   sum: "5",
8471
+                  user: {
8472
+                    engineer: 1,
8473
+                  }
8468 8474
                 };
8469 8475
                 if (key) {
8470
-                  data["user"] = {
8471
-                    name: key,
8472
-                  };
8476
+                  data.user.name = key;
8473 8477
                 }
8474 8478
                 APIService.fetchDataList("user", data).then(function (
8475 8479
                   response
@@ -10195,6 +10199,9 @@ appFormly.config(function config(formlyConfigProvider) {
10195 10199
               var data = {
10196 10200
                 idx: 0,
10197 10201
                 sum: 1000,
10202
+                user: {
10203
+                  engineer: 1,
10204
+                }
10198 10205
               };
10199 10206
               api_user_data.fetchDataList("user", data).then(function (res) {
10200 10207
                 $scope.personListData = res.list;
@@ -10499,6 +10506,9 @@ appFormly.config(function config(formlyConfigProvider) {
10499 10506
               var data = {
10500 10507
                 idx: 0,
10501 10508
                 sum: 1000,
10509
+                user: {
10510
+                  engineer: 1,
10511
+                }
10502 10512
               };
10503 10513
               api_user_data.fetchDataList("user", data).then(function (res) {
10504 10514
                 $scope.personListData = res.list;
@@ -13815,6 +13825,7 @@ appFormly.config(function config(formlyConfigProvider) {
13815 13825
                 groupdata: {
13816 13826
                   id: groupdata.option.id,
13817 13827
                 },
13828
+                engineer: 1,
13818 13829
               },
13819 13830
             };
13820 13831
             api_user_data
@@ -17269,6 +17280,9 @@ appFormly.config(function config(formlyConfigProvider) {
17269 17280
                   idx: 0,
17270 17281
                   sum: 100,
17271 17282
                   flag: -1,
17283
+                  user: {
17284
+                    engineer: 1,
17285
+                  }
17272 17286
                 };
17273 17287
                 getUser(fieldata, 3);
17274 17288
 

+ 2 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -1097,7 +1097,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1097 1097
                         "user":{
1098 1098
                             currentDuty: model.duty ? model.duty.id : undefined,
1099 1099
                             name: keyword,
1100
-                            selectType: "pinyin_qs"
1100
+                            selectType: "pinyin_qs",
1101
+                            engineer: 1,
1101 1102
                         }
1102 1103
                     };
1103 1104
                     api_simple.fetchDataList("user", postData).then(result => {

文件差異過大導致無法顯示
+ 0 - 1
assets/js/controllers/inspect/inspectForm.1.js


+ 3 - 1
assets/js/controllers/inspect/inspectListCtrl.js

@@ -410,7 +410,7 @@ app.controller("inspectListCtrl", [
410 410
                   $scope.assignGroup = item.id;
411 411
                   $scope.getUsers(item.id)
412 412
               }
413
-              
413
+
414 414
               $scope.ok = function () {
415 415
                   if (!$scope.assignUser){
416 416
                       Alert.swal({
@@ -720,6 +720,7 @@ app.controller("inspectListCtrl", [
720 720
               rolecode: "inspectman",
721 721
             },
722 722
             simple: true,
723
+            engineer: 1,
723 724
           },
724 725
         })
725 726
         .then(function (res) {
@@ -770,6 +771,7 @@ app.controller("inspectListCtrl", [
770 771
           sum: 1000,
771 772
           user: {
772 773
             simple: true,
774
+            engineer: 1,
773 775
           },
774 776
         })
775 777
         .then(function (res) {

文件差異過大導致無法顯示
+ 0 - 1
assets/js/controllers/inspect/inspectPlanCtrl.1.js


文件差異過大導致無法顯示
+ 7 - 5
assets/js/controllers/inspect/inspectPlanCtrl.js


+ 3 - 1
assets/js/controllers/inspect/integralCtrl.js

@@ -1107,6 +1107,7 @@ app.controller("integralCtrl", [
1107 1107
               rolecode: "inspectman",
1108 1108
             },
1109 1109
             simple: true,
1110
+            engineer: 1,
1110 1111
           },
1111 1112
         })
1112 1113
         .then(function (res) {
@@ -1122,7 +1123,8 @@ app.controller("integralCtrl", [
1122 1123
           sum: 1000,
1123 1124
           "user": {
1124 1125
             "name": keyword,
1125
-            'selectType': "pinyin_qs"
1126
+            'selectType': "pinyin_qs",
1127
+            engineer: 1,
1126 1128
           }
1127 1129
         })
1128 1130
         .then(function (res) {

+ 2 - 1
assets/js/controllers/knowledge/knowledgeCtrl.js

@@ -270,7 +270,8 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
270 270
             "idx": 0,
271 271
             "sum": 1000,
272 272
             "user":{
273
-                "simple": true
273
+                "simple": true,
274
+                engineer: 1,
274 275
             }
275 276
         }).then(function (res) {
276 277
             $scope.createUserData = res.list

+ 1 - 0
assets/js/controllers/mainCtrl.js

@@ -4726,6 +4726,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
4726 4726
                 simple:true,
4727 4727
                 name: key,
4728 4728
                 selectType: "pinyin_qs",
4729
+                engineer: 1,
4729 4730
               },
4730 4731
             };
4731 4732
             api_user_data.fetchDataList("user", userData).then(function (data) {

+ 2 - 1
assets/js/controllers/newOrder/newOrderCtrl.js

@@ -363,7 +363,8 @@ app.controller('newOrderCtrl', ["$scope", "$http", "i18nService", "$rootScope",
363 363
             "sum": 1000,
364 364
             "user": {
365 365
                 "selectType": "pinyin_qs",
366
-                "user": ""
366
+                "user": "",
367
+                engineer: 1,
367 368
             }
368 369
         };
369 370
         api_user_data.fetchDataList("user", data).then(function (res) {

+ 6 - 3
assets/js/controllers/plan/timingMessageSendingCtrl.js

@@ -340,7 +340,8 @@ app.controller('timingMessageSendingCtrl', ["$rootScope", "$scope", "$state", "$
340 340
     userIds = userIds || [];
341 341
     var dat = {
342 342
       "user": {
343
-        name: name
343
+        name: name,
344
+        engineer: 1,
344 345
       },
345 346
       "idx": 0,
346 347
       "sum": 999
@@ -900,7 +901,8 @@ app.controller('timingMessageSendingCtrl', ["$rootScope", "$scope", "$state", "$
900 901
         "roledata": {
901 902
           "rolecode": "inspectman"
902 903
         },
903
-        "simple": true
904
+        "simple": true,
905
+        engineer: 1,
904 906
       }
905 907
     }).then(function (res) {
906 908
       $scope.executeUserData = res.list
@@ -913,7 +915,8 @@ app.controller('timingMessageSendingCtrl', ["$rootScope", "$scope", "$state", "$
913 915
       "idx": 0,
914 916
       "sum": 1000,
915 917
       "user": {
916
-        "simple": true
918
+        "simple": true,
919
+        engineer: 1,
917 920
       }
918 921
     }).then(function (res) {
919 922
       $scope.createUserData = res.list

+ 1 - 0
assets/js/controllers/report/event_formCtrl.js

@@ -379,6 +379,7 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
379 379
                         "simple": true,
380 380
                         "name": keyWord,
381 381
                         "selectType": "pinyin_qs",
382
+                        engineer: 1,
382 383
                     }
383 384
                   };
384 385
                   if(own.duty){

文件差異過大導致無法顯示
+ 3 - 2
assets/js/controllers/system/informationCtrl.js


+ 3 - 2
assets/js/controllers/system/notice/notice.js

@@ -1,5 +1,5 @@
1 1
 'use strict';
2
-/** 
2
+/**
3 3
  * controller for User Profile Example
4 4
  */
5 5
 app.controller('noticeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$interval", "$modal", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_user_data", "api_login", "api_configure_data", function ($rootScope, $scope, $state, $timeout, $interval, $modal, SweetAlert, i18nService, uiGridConstants, uiGridGroupingConstants, Restangular, api_user_data, api_login, api_configure_data) {
@@ -244,7 +244,8 @@ app.controller('noticeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$in
244 244
             "idx": 0,
245 245
             "sum": 1000,
246 246
             "user":{
247
-                "simple":true
247
+                "simple":true,
248
+                engineer: 1,
248 249
             }
249 250
         }).then(function (res) {
250 251
             $scope.createUserData = res.list

+ 13 - 13
assets/js/controllers/system/user/groupCtrl.js

@@ -136,7 +136,7 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
136 136
     }
137 137
     $scope.try_async_load();
138 138
 
139
-    //end power 
139
+    //end power
140 140
     //tree  user
141 141
     $scope.try_async_powerload = function(items) {
142 142
         if (items) {
@@ -169,7 +169,7 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
169 169
     $scope.my_user = [];
170 170
     $scope.tile = [];
171 171
     $scope.try_async_user = function() {
172
-        var postData = { "idx": 0, "sum": 9999, user: {} };
172
+        var postData = { "idx": 0, "sum": 9999, user: {engineer: 1,} };
173 173
         if($rootScope.user.duty){
174 174
             // 当前的所属责任科室
175 175
             postData.user.duty = $rootScope.user.duty;
@@ -282,15 +282,15 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
282 282
                     $scope.disableDuty = false;
283 283
                     if($rootScope.user.duty){
284 284
                         $scope.disableBranch = true;
285
-                        $scope.disableDuty = true;  
285
+                        $scope.disableDuty = true;
286 286
                     }else if($rootScope.user.branch){
287 287
                         $scope.disableBranch = true;
288
-                        $scope.disableDuty = false; 
288
+                        $scope.disableDuty = false;
289 289
                     }
290 290
                     $scope.group = {};
291
-                    $scope.hospitalList = []; 
291
+                    $scope.hospitalList = [];
292 292
                     $scope.dutyDeptList = [];
293
-                    
293
+
294 294
                     // 获取院区
295 295
                     $scope.getHospitals = function(){
296 296
                     //跨科室转派
@@ -391,7 +391,7 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
391 391
                                     type: "error"
392 392
                                 })
393 393
                             }
394
-                            // $modalInstance.close();  
394
+                            // $modalInstance.close();
395 395
                         }
396 396
                     })
397 397
                 }
@@ -406,9 +406,9 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
406 406
                     $scope.disableBranch = true;
407 407
                     $scope.disableDuty = true;
408 408
                     $scope.group = angular.copy(scope.group);
409
-                    $scope.hospitalList = []; 
409
+                    $scope.hospitalList = [];
410 410
                     $scope.dutyDeptList = [];
411
-                    
411
+
412 412
                     // 获取院区
413 413
                     $scope.getHospitals = function(){
414 414
                         //跨科室转派
@@ -445,13 +445,13 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
445 445
                         }
446 446
                         })
447 447
                     }
448
-                    
448
+
449 449
                     $scope.cancel = function() {
450 450
                         $modalInstance.dismiss('cancel');
451 451
                     };
452 452
                     $scope.ok = function(item) {
453 453
                         $modalInstance.close(item);
454
-    
454
+
455 455
                     }
456 456
                 },
457 457
                 resolve: {
@@ -487,7 +487,7 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
487 487
                                     type: "error"
488 488
                                 })
489 489
                             }
490
-                            // $modalInstance.close();  
490
+                            // $modalInstance.close();
491 491
                         }
492 492
                     })
493 493
                 }
@@ -500,7 +500,7 @@ app.controller('grouplistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "
500 500
                 confirmButtonColor: "#DD6B55"
501 501
             });
502 502
         }
503
-        
503
+
504 504
     }
505 505
         //remove role
506 506
     $scope.removeRole = function() {

文件差異過大導致無法顯示
+ 8 - 5
assets/js/controllers/task/moonTaskCtrl.js


文件差異過大導致無法顯示
+ 8 - 5
assets/js/controllers/task/taskListCtrl.js


+ 1 - 1
assets/js/controllers/working/workingFormCtr.js

@@ -115,7 +115,7 @@ sysFormly.controller("workingFormCtrl", [
115 115
     $scope.try_async_user = function () {
116 116
       $scope.doing_asyncuser = true;
117 117
       api_user_data
118
-        .fetchDataList("user", { idx: 0, sum: 1000000 })
118
+        .fetchDataList("user", { idx: 0, sum: 1000000,user:{engineer: 1,} })
119 119
         .then(function (response) {
120 120
           if (response.status == 200) {
121 121
             var data = response.list;