1、修改车辆信息管理/人员信息管理/车辆配置管理中所属公司下拉显示列表，根据登录用户权限显示所属公司列表

徐烜
1 parent d0cfd750
Showing 11 changed files with 76 additions and 7 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/main.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
@@ -72,7 +72,7 @@
                                     cmaps="{'businessCode': 'businessCode', 'company': 'businessName'}"
                                     dcname="businessCode"
                                     icname="businessCode"
-                                    dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                    dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
                                     searchph="请选择所属分公司..."
@@ -71,7 +71,7 @@
                                     cmaps="{'businessCode': 'businessCode', 'company': 'businessName'}"
                                     dcname="businessCode"
                                     icname="businessCode"
-                                    dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                    dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
                                     searchph="请选择所属分公司..."
@@ -35,7 +35,7 @@
                                 cmaps="{'businessCode_eq': 'businessCode'}"
                                 dcname="businessCode_eq"
                                 icname="businessCode"
-                                dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.businessName"
                                 searchph="请输拼音..."
@@ -15,6 +15,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 "equipmentCode_like" : "",
                 "carPlate_like" : ""
             };
+
+            // 所属公司下拉框查询参数
+            var gsSelectQueryCondition = {
+                businessCode_in: '-999'
+            };
+
             // 当前查询返回的信息
             var currentPage = { // 后台spring data返回的格式
                 totalElements: 0,
@@ -58,6 +64,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return orderColumns;
                 },
                 /**
+                 * 获取所属公司下拉框查询条件。
+                 */
+                getGsSelectQueryCondition: function() {
+                    if (UserPrincipal.getGsbmStrsQuery().length > 0) {
+                        gsSelectQueryCondition["businessCode_in"] = UserPrincipal.getGsbmStrsQuery();
+                    }
+                    return gsSelectQueryCondition;
+                },
+                /**
                  * 获取查询条件信息，
                  * 用于给controller用来和页面数据绑定。
                  */
@@ -277,6 +292,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 return service.getSearchCondition();
             };
  
+            self.gsSelectQueryParam = function() {
+                return service.getGsSelectQueryCondition();
+            };
+
             self.doPage = function() {
                 var result = Cars.list(self.searchCondition(), function() {
                     if (!result.status) {
@@ -408,6 +427,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
  
+            self.gsSelectQueryParam = function() {
+                return service.getGsSelectQueryCondition();
+            };
+
         }
     ]
 );
@@ -41,7 +41,7 @@
                                     cmaps="{'companyCode': 'businessCode', 'company': 'businessName'}"
                                     dcname="companyCode"
                                     icname="businessCode"
-                                    dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                    dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
                                     searchph="请选择所属分公司..."
@@ -41,7 +41,7 @@
                                     cmaps="{'companyCode': 'businessCode', 'company': 'businessName'}"
                                     dcname="companyCode"
                                     icname="businessCode"
-                                    dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                    dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.businessName"
                                     searchph="请选择所属分公司..."
@@ -39,7 +39,7 @@
                                 cmaps="{'companyCode_eq': 'businessCode'}"
                                 dcname="companyCode_eq"
                                 icname="businessCode"
-                                dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.businessName"
                                 searchph="请输拼音..."
@@ -16,6 +16,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 //"carPlate_like" : ""
             };
  
+            // 所属公司下拉框查询参数
+            var gsSelectQueryCondition = {
+                businessCode_in: '-999'
+            };
+
             // 当前查询返回的信息
             var currentPage = { // 后台spring data返回的格式
                 totalElements: 0,
@@ -57,6 +62,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return orderColumns;
                 },
                 /**
+                 * 获取所属公司下拉框查询条件。
+                 */
+                getGsSelectQueryCondition: function() {
+                    if (UserPrincipal.getGsbmStrsQuery().length > 0) {
+                        gsSelectQueryCondition["businessCode_in"] = UserPrincipal.getGsbmStrsQuery();
+                    }
+                    return gsSelectQueryCondition;
+                },
+                /**
                  * 获取查询条件信息，
                  * 用于给controller用来和页面数据绑定。
                  */
@@ -262,6 +276,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 return service.getSearchCondition();
             };
  
+            self.gsSelectQueryParam = function() {
+                return service.getGsSelectQueryCondition();
+            };
+
             self.doPage = function() {
                 var result = Employee.list(self.searchCondition(), function() {
                     if (!result.status) {
@@ -397,6 +415,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
  
+            self.gsSelectQueryParam = function() {
+                return service.getGsSelectQueryCondition();
+            };
+
             $scope.$watch(
                 function() {
                     return self.employeeInfoForSave;
@@ -21,6 +21,8 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
         var gsinfo_strs_u = []; // 拼装以后的（分公司代码_公司代码）
         var gsinfo_strs_query = []; // 拼装以后的（公司代码_分公司代码），带单引号
  
+        var gsbm_strs_query = []; // 公司代码，逗号分隔
+
         $http({
             method: 'GET',
             url: '/user/companyData'
@@ -29,6 +31,7 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
                 gsinfos = result;
                 angular.forEach(result.data, function(obj) {
                     var gsbm = obj.companyCode;
+                    gsbm_strs_query.push(gsbm);
                     angular.forEach(obj.children, function(obj2) {
                         var fgsbm = obj2.code;
                         gsinfo_strs.push(gsbm + "_" + fgsbm);
@@ -51,6 +54,9 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
             },
             getGsStrsQuery: function() {
                 return gsinfo_strs_query;
+            },
+            getGsbmStrsQuery: function() {
+                return gsbm_strs_query;
             }
         };
     }
@@ -39,7 +39,7 @@
                                 cmaps="{'cl.businessCode_eq': 'businessCode'}"
                                 dcname="cl.businessCode_eq"
                                 icname="businessCode"
-                                dsparams="{{ {type: 'ajax', param:{'businessCode_eq': '100' }, atype:'gs' } | json }}"
+                                dsparams="{{ {type: 'ajax', param: ctrl.gsSelectQueryParam(), atype:'gs' } | json }}"
                                 iterobjname="item"
                                 iterobjexp="item.businessName"
                                 searchph="请输拼音..."
@@ -8,6 +8,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
  
+            // 所属公司下拉框查询参数
+            var gsSelectQueryCondition = {
+                businessCode_in: '-999'
+            };
+
             // 当前查询返回的信息
             var currentPage = { // 后台spring data返回的格式
                 totalElements: 0,
@@ -49,6 +54,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     return orderColumns;
                 },
                 /**
+                 * 获取所属公司下拉框查询条件。
+                 */
+                getGsSelectQueryCondition: function() {
+                    if (UserPrincipal.getGsbmStrsQuery().length > 0) {
+                        gsSelectQueryCondition["businessCode_in"] = UserPrincipal.getGsbmStrsQuery();
+                    }
+                    return gsSelectQueryCondition;
+                },
+                /**
                  * 获取查询条件信息，
                  * 用于给controller用来和页面数据绑定。
                  */
@@ -253,6 +267,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
  
+            self.gsSelectQueryParam = function() {
+                return service.getGsSelectQueryCondition();
+            };
+
             self.doPage();
  
             self.customOrder = function() {