资产和任务管理BUG修复

assets/js/controllers/customform/customformCtrl.js

@@ -10201,8 +10201,16 @@ appFormly.config(function config(formlyConfigProvider) {
                 sum: 1000,
                 user: {
                   engineer: 1,
+                  "simple": true,
                 }
               };
+              if($rootScope.user.duty){
+                // 当前的所属责任科室
+                data.user.duty = $rootScope.user.duty;
+              }else if($rootScope.user.branch){
+                // 当前的所属院区
+                data.user.branch = $rootScope.user.branch;
+              }
               api_user_data.fetchDataList("user", data).then(function (res) {
                 $scope.personListData = res.list;
               });
@@ -10508,8 +10516,16 @@ appFormly.config(function config(formlyConfigProvider) {
                 sum: 1000,
                 user: {
                   engineer: 1,
+                  "simple": true,
                 }
               };
+              if($rootScope.user.duty){
+                // 当前的所属责任科室
+                data.user.duty = $rootScope.user.duty;
+              }else if($rootScope.user.branch){
+                // 当前的所属院区
+                data.user.branch = $rootScope.user.branch;
+              }
               api_user_data.fetchDataList("user", data).then(function (res) {
                 $scope.personListData = res.list;
               });

assets/js/controllers/task/moonTaskCtrl.js

@@ -248,8 +248,16 @@ app.controller('moonTaskListCtrl', ["$rootScope", "$scope", "$state", "$timeout"
             "sum":1000,
             user: {
                 engineer: 1,
+                "simple": true,
             }
         }
+        if($rootScope.user.duty){
+            // 当前的所属责任科室
+            data.user.duty = $rootScope.user.duty;
+        }else if($rootScope.user.branch){
+            // 当前的所属院区
+            data.user.branch = $rootScope.user.branch;
+        }
         api_user_data.fetchDataList("user",data).then(function(res){
             $scope.personListData=res.list;
         })

assets/js/controllers/task/taskFormCtr.js

@@ -345,6 +345,23 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
                     process = WechatRestangular.all("");
                 }
                 var datakey = { "idx": 0, "sum": 1000 };
+                if(field.templateOptions.optionsUrl === 'user/data/fetchDataList/user'){
+                    datakey = {
+                        "idx": 0,
+                        "sum": 1000,
+                        "user": {
+                            "engineer": 1,
+                            "simple": true
+                        }
+                    }
+                    if($rootScope.user.duty){
+                        // 当前的所属责任科室
+                        datakey.user.duty = $rootScope.user.duty;
+                    }else if($rootScope.user.branch){
+                        // 当前的所属院区
+                        datakey.user.branch = $rootScope.user.branch;
+                    }
+                }
                 if (field.templateOptions.modelreasondata) {
                     datakey = field.templateOptions.modelreasondata
                 }

assets/js/controllers/task/taskListCtrl.js

@@ -196,8 +196,16 @@ app.controller('taskListListCtrl', ["$rootScope", "$scope", "$state", "$timeout"
             "sum":1000,
             user: {
                 engineer: 1,
+                "simple": true,
             }
         }
+        if($rootScope.user.duty){
+            // 当前的所属责任科室
+            data.user.duty = $rootScope.user.duty;
+        }else if($rootScope.user.branch){
+            // 当前的所属院区
+            data.user.branch = $rootScope.user.branch;
+        }
         api_user_data.fetchDataList("user",data).then(function(res){
             $scope.personListData=res.list;
         })

assets/views/task/moonTask.html

@@ -69,10 +69,10 @@
     .selectBotBox .search_condition{
         width: 80%;
         display: flex;
-        flex-wrap:wrap;        
+        flex-wrap:wrap;
     }
     .selectBotBox .search_condition .search_children{
-        width: 220px;
+        width: 230px;
         height: 28px;
         line-height: 28px;
         display: flex;

assets/views/task/taskList.html

@@ -71,7 +71,7 @@
         flex-wrap:wrap;
     }
     .selectBotBox .search_condition .search_children{
-        width: 220px;
+        width: 230px;
         height: 28px;
         line-height: 28px;
         display: flex;