线路查询，过滤remove=1的线路

zlz
1 parent 0d4caf81
Showing 5 changed files with 90 additions and 98 deletions
src/main/resources/static/pages/trafficManage/js/lineStationUpload.js
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
src/main/resources/static/pages/trafficManage/js/shLineCodeList.js
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
@@ -13,45 +13,49 @@
  */
  
 (function(){
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
  
-    $('#line').select2({
-        ajax: {
-            url: '/realSchedule/findLine',
-            type: 'post',
-            dataType: 'json',
-            delay: 150,
-            data: function(params){
-                return{line: params.term};
-            },
-            processResults: function (data) {
-                return {
-                    results: data
-                };
-            },
-            cache: true
-        },
-        templateResult: function(repo){
-            if (repo.loading) return repo.text;
-            var h = '<span>'+repo.text+'</span>';
-            return h;
-        },
-        escapeMarkup: function (markup) { return markup; },
-        minimumInputLength: 1,
-        templateSelection: function(repo){
-            return repo.text;
-        },
-        language: {
-            noResults: function(){
-                return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-            },
-            inputTooShort : function(e) {
-                return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-            },
-            searching : function() {
-                return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
+    function initLineSelect2(compD) {
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
             }
-        }
-    });
+            params["remove_ne"] = 1;
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.id ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
  
 	// 绑定查询事件
 	$("#search").click(searchM);
@@ -49,6 +49,7 @@
                 }
                 params.cgsbm_in  = compA.toString();
             }
+            params["remove_ne"] = 1;
             // 填充线路拉框选择值
             $get('/line/all', params, function(array){
                 var len_ = array.length,paramsD = new Array();
@@ -34,8 +34,9 @@
 	}
 	var lines = new Array();
 	var gsmap = getBusMap();
+    var pars = {"remove_ne":1};
 	// 取得所有线路
-	$get('/line/all', null, function(allLine) {
+	$get('/line/all', pars, function(allLine) {
 		// 遍历数组
 		$.each(allLine, function(i, e) {
 			var companyCode = e.company;
@@ -13,66 +13,51 @@
  */
  
 (function(){
-	/**
-	 *  取得编码-公司map
-	 *  gsmap["5"] = 南汇公司
-	 *  gsmap["5_3"] = 芦潮港分公司
-	 */
-	function getBusMap(){
-		// 取得公司信息，替换公司编码
-		var gsmap = {};
-		$get('/business/all', null, function(array){
-			$.each(array, function(i, gs){
-				var k = gs.upCode + '_' + gs.businessCode;
-				if(gs.upCode === '88'){
-					k = gs.businessCode;
-				}
-				gsmap[k] = gs.businessName;
-			});
-		});
-		return gsmap;
-	}
-	var lines = new Array();
-	var gsmap = getBusMap();
-
-	$('#line').select2({
-		ajax: {
-			url: '/realSchedule/findLine',
-			type: 'post',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{line: params.term};
-			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-		   }
-		}
-	});
+	
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
+
+    function initLineSelect2(compD) {
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
+            }
+            params["remove_ne"] = 1;
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.id ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
+
  
 	// 绑定查询事件
 	$("#search").click(searchM);
@@ -88,6 +88,7 @@
         }
         var lines = new Array();
         var gsmap = getBusMap();
+        params["remove_ne"] = 1;
         // 取得所有线路
         $get('/line/all', params, function(allLine) {
             // 遍历数组