月存油报表线调内缺少公司编码查询条件造成后台报错问题

娄高锋
1 parent b49f9724
Showing 1 changed file with 21 additions and 36 deletions
src/main/resources/static/pages/report/oil/oilListMonth.html
@@ -104,27 +104,6 @@
 			$("#date").val(year + "-0" + month + "-" + day);
 		}
-		/* var tempData = {};
-		$.get('/report/lineList',function(xlList){
-			var data = [];
-			$.get('/user/companyData', function(result){
-				for(var i = 0; i < result.length; i++){
-					var companyCode = result[i].companyCode;
-					var children = result[i].children;
-					for(var j = 0; j < children.length; j++){
-						var code = children[j].code;
-						for(var k=0;k < xlList.length;k++ ){
-							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
-								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
-								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
-							}
-						}
-					}
-				}
-				initPinYinSelect2('#line',data,'');
-				
-			});
-		}); */
 		var fage=false;
 		var obj = [];
 		var xlList;
@@ -150,6 +129,7 @@
 			});
 		});
+		var tempData = {};
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
@@ -164,11 +144,11 @@
 			}
 			$('#fgsdm').html(options);
-			var tempData = {};
 			$.get('/report/lineList',function(xlList){
 				var data = [];
 				data.push({id: " ", text: "全部线路"});
 				$.get('/user/companyData', function(result){
+					tempData = {};
 					for(var i = 0; i < result.length; i++){
 						var companyCode = result[i].companyCode;
 						var children = result[i].children;
@@ -186,22 +166,22 @@
 				});
 			});
-			
-			$("#line").on("change", function(){
-				if($("#line").val() == " "){
-					$("#gsdm").attr("disabled", false);
-					$("#fgsdm").attr("disabled", false);
-				} else {
-					var temp = tempData[$("#line").val()].split(":");
-					$("#gsdm").val(temp[0]);
-					updateCompany();
-					$("#fgsdm").val(temp[1]);
-					$("#gsdm").attr("disabled", true);
-					$("#fgsdm").attr("disabled", true);
-				}
-			});
 		}
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdm").attr("disabled", false);
+				$("#fgsdm").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdm").val(temp[0]);
+// 				updateCompany();
+				$("#fgsdm").val(temp[1]);
+				$("#gsdm").attr("disabled", true);
+				$("#fgsdm").attr("disabled", true);
+			}
+		});
+		
 		//查询
@@ -214,6 +194,11 @@
 			var date = $("#date").val();
 			var gsdm = $("#gsdm").val();
 			var fgsdm = $("#fgsdm").val();
+			if(!gsdm || !fgsdm){
+				var temp = tempData[line].split(":");
+				gsdm = temp[0];
+				fgsdm = temp[1];
+			}
 			var i = layer.load(2);
 			$get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
 				var oilListMonth = template('oilListMonth',{list:result});