Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into pudong

王通
2 parents 13effc27 477bfe43
Showing 3 changed files with 20 additions and 31 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/mforms/singledatas/singledata.html
src/main/resources/static/pages/mforms/singledatas/singledatas.html
@@ -1151,8 +1151,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				// 不做处理
 			}
 		}
-		skbUploadLogger.setUploadXml(xml);// 上传的参数
-		skbUploadLogger.setUploadXmlSub(xml_sub);
+//		skbUploadLogger.setUploadXml(xml);// 上传的参数
+//		skbUploadLogger.setUploadXmlSub(xml_sub);
 		skbUploadLogger.setState(state);// 状态：是否成功
 		skbUploadLogger.setUser(user);
 		// 时刻表
@@ -1182,8 +1182,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					String name = line.getName() + "路单上传";
 					skbUploadLogger  = new SKBUploadLogger();
 					skbUploadLogger.setType(type);// 设置类型
-					skbUploadLogger.setUploadXml(xml);// 上传的参数
-					skbUploadLogger.setUploadXmlSub(xml_sub);
+//					skbUploadLogger.setUploadXml(xml);// 上传的参数
+//					skbUploadLogger.setUploadXmlSub(xml_sub);
 					skbUploadLogger.setState(state);// 状态：是否成功
 					skbUploadLogger.setUser(user);
 					skbUploadLogger.setLine(line);
@@ -214,7 +214,7 @@
 		    var tjtype=$("#tjtype").val();
 		    var params = {};
 		    var i = layer.load(2);
-// 		    if(tjtype=='jsy'){
+		    if(tjtype=='jsy'){
 		    	$get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
 			   		layer.close(i);
 			        var singledata = template('singledata',{list:result});
@@ -222,21 +222,15 @@
 			        $('#forms tbody').html(singledata);
 			    }); 
-// 		    }else{
-// 		    	$get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
-// 			   		layer.close(i);
-// 			        var date=new Array();     //存放文本框数组 
-// 			   		$.each(result, function (i, obj) {
-// 	                   if(obj.sgh !='' && obj.sgh!=null){
-// 	                	   date.push(obj);
-// 	                   }
-// 	                });
-// 			        var singledata = template('singledata2',{result});
-// 	                // 把渲染好的模版html文本追加到表格中
-// 			        $('#forms tbody').html(singledata);
+		    }else{
+		    	$get("/mcy_forms/singledatatj2",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+			   		layer.close(i);
+			        var singledata = template('singledata',{list:result});
+	                // 把渲染好的模版html文本追加到表格中
+			        $('#forms tbody').html(singledata);
-// 			    }); 
-// 		    }
+			    }); 
+		    }
 		});
@@ -204,7 +204,7 @@
 			    }); 
 		    }else{
-		    	$get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+		    	$get("/mcy_forms/singledata2",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
 					layer.close(i);
@@ -225,20 +225,15 @@
 			    var gsdmSing = $("#gsdmSing").val();
 			    var fgsdmSing = $("#fgsdmSing").val(); 
 			    var tjtype=$("#tjtype").val();
-// 				 if(tjtype=='jsy'){
+				 if(tjtype=='jsy'){
 			    	$get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
 						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
 					});
-// 			    }else{
-// 				   $("#forms").table2excel({
-// 							// 不被导出的表格行的CSS class类
-// 							exclude: ".noExl",
-// 							// 导出的Excel文档的名称，（没看到作用）
-// 							name: "Excel Document Name.xlsx",
-// 							// Excel文件的名称
-// 							filename: "路单数据"+startDate
-// 						});
-// 				}
+			    }else{
+			    	$get('/mcy_export/singledataExport2',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
+						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+					});
+				}
 		});
 	});