Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8

王通
2 parents c80e2f24 d003db3f
Showing 1 changed file with 12 additions and 51 deletions
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
@@ -164,51 +164,7 @@
 		$("#times1").attr("disabled", true);
 		$("#times2").attr("disabled", true);
-// 		$.get('/basic/lineCode2Name', function(result){
-// 			var data=[];
-			
-// 			data.push({id: " ", text: "全部线路"});
-// 			for(var code in result){
-// 				data.push({id: code, text: result[code]});
-// 			}
-// 			console.log(data);
-// 			initPinYinSelect2('#line',data,'');
-
-// 			line = "";
-// 			updateModel();
-// 		})
-		
-// 		var obj = [];
-// 		$.get('/user/companyData', function(result){
-// 			obj = result;
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-// 			}
-// 			if(obj.length == 1){
-// 				$('#company1').hide();
-// 				if(obj[0].children.length == 1)
-// 					$('#subCompany1').hide();
-// 			}
-// 			$('#company').html(options);
-// 			updateCompany();
-// 		});
-
-// 		$("#company").on("change",updateCompany);
-// 		function updateCompany(){
-// 			var company = $('#company').val();
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				if(obj[i].companyCode == company){
-// 					var children = obj[i].children;
-// 					for(var j = 0; j < children.length; j++){
-// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-// 					}
-// 				}
-// 			}
-// 			$('#subCompany').html(options);
-// 		}
-		var fage=false;
+		var fage=true;
 		var xlList;
 		var obj = [];
@@ -221,12 +177,14 @@
 					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
 				}
-				if(obj.length ==0){
+				if(obj.length == 0){
 					 $("#company1").css('display','none');
-				}else if(obj.length ==1){
+				}else if(obj.length == 1){
 					 $("#company1").css('display','none');
-					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					if(obj[0].children.length == 1 || obj[0].children.length == 0){
+						fage = false;
 						$('#subCompany1').css('display','none');
+					}
 				}
 				$('#company').html(options);
 				updateCompany();
@@ -235,7 +193,10 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '<option value="">全部分公司</option>';
+			var options = '';
+			if(fage){
+				options = '<option value="">全部分公司</option>';
+			}
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -278,8 +239,8 @@
 				var temp = tempData[$("#line").val()].split(":");
 				$("#company").val(temp[0]);
 				updateCompany();
-// 				$("#subCompany").val(temp[1]);
-				$("#subCompany").val("");
+				$("#subCompany").val(temp[1]);
+// 				$("#subCompany").val("");
 				$("#company").attr("disabled", true);
 // 				$("#subCompany").attr("disabled", true);
 			}