新增

廖磊
1 parent 23f73f00
Showing 12 changed files with 1251 additions and 396 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/excep/offlineList.html
src/main/resources/static/pages/forms/statement/waybillBf.html
src/main/resources/static/pages/forms/statement/waybillQp.html
src/main/resources/static/pages/oil/checkJyryList.html
src/main/resources/static/pages/oil/cylList.html
src/main/resources/static/pages/oil/jyglList.html
@@ -351,7 +351,15 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value="/queryListWaybill")
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date){
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date);
+		String type="fqp";
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
+	}
+	
+	@RequestMapping(value="/queryListWaybillQp")
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date){
+		String type="qp";
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type);
 	}
 	@RequestMapping(value="/statisticsDaily")
@@ -10,6 +10,8 @@ import javax.persistence.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
+import com.bsth.data.BasicData;
+
 @Entity
 @Table(name = "bsth_c_ylxxb")
 public class Ylxxb {
@@ -38,6 +40,10 @@ public class Ylxxb {
 	private String ldgh;
 	//0为接口数据，1为手工输入
 	private int jylx=0;
+	@Transient
+	private String gsname;
+	@Transient
+	private String fgsname;
 	public Integer getId() {
@@ -163,6 +169,20 @@ public class Ylxxb {
 		this.jylx = jylx;
 	}
+	public String getGsname() {
+		return BasicData.businessCodeNameMap.get(this.gsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
 }
 package com.bsth.service.oil.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
@@ -28,17 +33,103 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 	@Autowired
 	YlxxbRepository ylxxbRepository;
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
 	@SuppressWarnings("unchecked")
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
-		// TODO Auto-generated method stub
+		int page=Integer.parseInt(map.get("page").toString());
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		List<Ylxxb> yList=new ArrayList<Ylxxb>();
+		
 		String rq=map.get("rq").toString();
 		String nbbm="";
-		if(map.get("nbbm")!=null){
-			nbbm=map.get("nbbm").toString();
+		if(map.get("nbbh")!=null){
+			nbbm=map.get("nbbh").toString();
+		}
+		
+		Object gsdmIn=map.get("gsdm_in");
+		Object fgsdmIn=map.get("fgsdm_in");
+		String addSql="";
+		String  gsdmLike="";
+		String  fgsdmLike="";
+		
+		//选择了公司 
+		if(gsdmIn==null){
+			gsdmLike=map.get("gsdm_like").toString();
+			addSql += " and a.gsdm = '"+gsdmLike+ "' ";
+			
+			//选择了分公司
+			if(fgsdmIn==null){
+				fgsdmLike=map.get("fgsdm_like").toString();;
+				addSql += " and a.fgsdm = '"+fgsdmLike+ "' ";
+			}else{
+				String fgsdmIns[]= fgsdmIn.toString().split(",");
+				addSql +=" and a.fgsdm in (";
+				for(int i=0;i<fgsdmIns.length;i++){
+					addSql +="'"+fgsdmIns[i]+"'";
+					if(i<fgsdmIns.length-1){
+						addSql +=",";
+					}
+				}
+				addSql +=")";
+			}
+		}else{
+			//没有选择公司 （分公司也没有选择）
+			String gsdmIns[]=gsdmIn.toString().split(",");
+			addSql += " and a.gsdm in (";
+			for(int i=0;i<gsdmIns.length;i++){
+				addSql +="'" +gsdmIns[i]+"'";
+				if(i<gsdmIns.length-1){
+					addSql+=",";
+				}
+			}
+			addSql +=")";
+			String fgsdmIns[]= fgsdmIn.toString().split(",");
+			addSql +=" and a.fgsdm in (";
+			for(int i=0;i<fgsdmIns.length;i++){
+				addSql +="'"+fgsdmIns[i]+"'";
+				if(i<fgsdmIns.length-1){
+					addSql +=",";
+				}
+			}
+			addSql +=")";
+			
+			
 		}
-		List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
+		String countSql="SELECT ifnull(count(*),0) as countTs FROM  bsth_c_cwjy  a "+ 
+				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql ;
+		int listsize=jdbcTemplate.queryForObject(countSql, Integer.class);
+		// TODO Auto-generated method stub
+		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
+				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql+ "  limit "+page*10+","+10;
+		
+		
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 return t;
+			 }
+		});
+		/*List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
 		for (int i = 0; i < list.size(); i++) {
 			Ylxxb y=new Ylxxb();
 			y.setGsdm(list.get(i)[0]==null?"":list.get(i)[0].toString());
@@ -57,8 +148,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				e.printStackTrace();
 			}
 			yList.add(y);
-		}
-		PageHelper pageHelper = new PageHelper(yList.size(), map);
+		}*/
+		PageHelper pageHelper = new PageHelper(listsize, map);
 		pageHelper.getMap();
 		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
 		pageObject.setDataList(yList);
@@ -34,6 +34,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
+		
 		String rq=map.get("yyrq").toString();
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 		try {
@@ -51,6 +52,15 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
+		/*if(map.get("gsdm_in")!=null){
+			map.put("ssgsdm_in", map.get("gsdm_in"));
+			map.remove("gsdm_in");
+			
+		}else{
+			map.put("ssgsdm_like", map.get("gsdm_like"));
+			map.remove("gsdm_like");
+		}*/
+		
 		//根具条件查询指定日期Ylb的数据
 		List<Ylb> ylbIterator=(List<Ylb>) ylbRepository.findAll(new CustomerSpecs<Ylb>(map));
 		List<Ylxxb> list=new ArrayList<Ylxxb>();
@@ -98,7 +98,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String type);
 	Map<String, Object> removeChildTask(Long taskId);
@@ -1209,8 +1209,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
-			String lpName,String date) {
-		return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
+			String lpName,String date,String type) {
+		if(type.equals("qp")){
+			return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
+		}else{
+			return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
+		}
 	}
 	@Override
@@ -223,6 +223,7 @@ $(function(){
 	}
 	function showPagination(data){
+		console.log(data);
 		//分页
 		$('#pagination').jqPaginator({
 		    totalPages: data.totalPage,
@@ -299,11 +300,4 @@ $(function(){
 		}
 	});
 });
-//改变状态
-function changeEnabled(id,enabled){
-	debugger
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
 </script>
 \ No newline at end of file
-<style type="text/css">
-	.table-bordered {
-	  border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td,
-	  .table-bordered > tbody > tr > th,
-	  .table-bordered > tbody > tr > td,
-	  .table-bordered > tfoot > tr > th,
-	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td {
-	    border-bottom-width: 2px; }
-	 
-	 .table > tbody + tbody {
-	   border-top: 1px solid; }
-</style>
-
-<div class="page-head">
-	<div class="page-title">
-		<h1>行车路单</h1>
-	</div>
-</div>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>行车路单</h1>
+	</div>
+</div>
+
 <div class="row">
+
 	<div class="col-md-12">
+
 		<div class="portlet light porttlet-fit bordered">
+
 			<div class="portlet-title">
+
 				<form class="form-inline" action="">
+
 					<div style="display: inline-block;">
-						<span class="item-label" style="width: 80px;">线路: </span>
+
+						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+
 					</div>
+
 					<div style="display: inline-block;margin-left: 15px;">
+
 						<span class="item-label" style="width: 80px;">时间: </span>
+
 						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+
 					</div>
+
 					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+
 						<input class="btn btn-default" type="button" id="query" value="查询"/>
+
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
+
 						<input class="btn btn-default" type="button" id="print" value="打印"/>
+
 						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+
 					</div>
+
 				</form>
+
 			</div>
+
 			<div class="portlet-body">
+
 				<div class="row">
+
 					<div class="col-md-3">
+
 						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
+
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+
 								<thead>
+
 									<tr class="hidden">
+
 										<th>人员</th>
+
 										<th>自编号</th>
+
 										<th>路牌</th>
+
 									</tr>
+
 								</thead>
+
 								<tbody>
+
+
 								</tbody>
+
 							</table>
+
 						</div>
+
 					</div>
+
 					<div class="col-md-9"  id="printArea">
+
 						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+
 							<table class="table table-bordered table-checkable" id="forms">
-								<tbody class="ludan_1">
-									
-								</tbody>
-						        <tbody class="ludan_2">
-						        	
-						        </tbody>
-						        <tbody class="ludan_3">
-						        	
-						        </tbody>
-						        <tbody class="ludan_4">
-						        	
+
+								<tbody class="ludan_1">
+									
+								</tbody>
+						        <tbody class="ludan_2">
+						        	
+						        </tbody>
+						        <tbody class="ludan_3">
+						        	
+						        </tbody>
+						        <tbody class="ludan_4">
+						        	
 						        </tbody>
+
 							</table>
+
 						</div>
+
 					</div>
+
 				</div>
+
 			</div>
+
 		</div>
+
 	</div>
+
 </div>
+
+
 <script>
+
 	$(function(){
+
 		// 关闭左侧栏
+
 		if (!$('body').hasClass('page-sidebar-closed'))
-			$('.menu-toggler.sidebar-toggler').click();
+
+			$('.menu-toggler.sidebar-toggler').click();
+
 		$("#date").datetimepicker({
+
 			format : 'YYYY-MM-DD',
+
 			locale : 'zh-cn'
-		});
-		
-		$('#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>';
-			   }
-			}
-		});
-		
+
+		});
+		
+		$('#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>';
+			   }
+			}
+		});
+		
 		var date = '';
+
 		$("#query").on("click",function(){
+
 			var line = $("#line").val();
-			date = $("#date").val();
+
+			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
+
 			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+
 				// 把数据填充到模版中
+
 				var tbodyHtml = template('list_info',{list:result});
+
 				// 把渲染好的模版html文本追加到表格中
+
 				$('#info tbody').html(tbodyHtml);
+
 			});
-		});
-		
-		var params = new Array();
+
+		});
+		
+		var params = new Array();
 		var jName = '';
-		$("#info tbody").on("click","tr",function(){
-			if($(this).children().size() < 2){
-				return;
+
+		$("#info tbody").on("click","tr",function(){
+			if($(this).children().size() < 2){
+				return;
 			}
+
+
 			$(this).children().each(function(index){
+
 				params[index] = $(this).text();
-			});
-			console.log(params);
-			jName = params[0].split("\\")[0];
-			var id = $("#"+params[1]).val();
-			$get('/realSchedule/'+id,null,function(result){
-				console.log(result);
-			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
-				var ludan_1 = template('ludan_1',result);
-				//var ludan_4 = template('ludan_4',result);
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .ludan_1').html(ludan_1);
-				//$('#forms .ludan_4').html(ludan_4);
+
+			});
+			console.log(params);
+			jName = params[0].split("\\")[0];
+			var id = $("#"+params[1]).val();
+			$get('/realSchedule/'+id,null,function(result){
+				console.log(result);
+			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+				var ludan_1 = template('ludan_1',result);
+				//var ludan_4 = template('ludan_4',result);
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_1').html(ludan_1);
+				//$('#forms .ludan_4').html(ludan_4);
 			});
-			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+
+			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
 			    getTime(result);
+
 				var ludan_2 = template('ludan_2',{list:result});
+
 				// 把渲染好的模版html文本追加到表格中
+
 				$('#forms .ludan_2').html(ludan_2);
-			});
-			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-			    var ludan_3 = template('ludan_3',result);
-			    $('#forms .ludan_3').html(ludan_3);
-			});
+
+			});
+			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+			    var ludan_3 = template('ludan_3',result);
+			    $('#forms .ludan_3').html(ludan_3);
+			});
-		});
-		
-		$("#export").on("click",function(){
-			if(params.length < 1){
-				return;
-			}
-			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-				window.open("/downloadFile/download?fileName="+jName);
-			});
-		});
-		
-		$("#print").click(function(){
-			$("#printArea").printArea();
-		});
-		
-		$("#exportMore").on("click",function(){
-			return;
-			$post('/realSchedule/exportWaybillMore',{date:date},function(result){
-				window.open("/downloadFile/download?fileName="+jName);
-			});
-		});
-		
-		function getTime(list){
-            $.each(list, function(i, obj) {
-                if(obj.zdsj != null && obj.zdsjActual != null ){
-                    var zdsjActual = (obj.zdsjActual).split(":");
-                    var zdsj = (obj.zdsj).split(":");
-                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
-                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
-                    }
-                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
-                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
-                    }
-                }
-            }); 
+
+		});
+		
+		$("#export").on("click",function(){
+			if(params.length < 1){
+				return;
+			}
+			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+				window.open("/downloadFile/download?fileName="+jName);
+			});
+		});
+		
+		$("#print").click(function(){
+			$("#printArea").printArea();
+		});
+		
+		$("#exportMore").on("click",function(){
+			return;
+			$post('/realSchedule/exportWaybillMore',{date:date},function(result){
+				window.open("/downloadFile/download?fileName="+jName);
+			});
+		});
+		
+		function getTime(list){
+            $.each(list, function(i, obj) {
+                if(obj.zdsj != null && obj.zdsjActual != null ){
+                    var zdsjActual = (obj.zdsjActual).split(":");
+                    var zdsj = (obj.zdsj).split(":");
+                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    }
+                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    }
+                }
+            }); 
 		}
+
 	});
+
 </script>
+
 <script type="text/html" id="list_info">
+
 	{{each list as obj i}}
+
 		<tr>
+
 			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+
 			<td width="32%">{{obj[2]}}</td>
+
 			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+
 		</tr>
+
 	{{/each}}
+
 	{{if list.length == 0}}
+
 		<tr>
+
 			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+
 		</tr>
+
 	{{/if}}
-</script>
-<script type="text/html" id="ludan_1">
-	  <tr>
-          <td colspan="14">行车路单</td>
-      </tr>
-      <tr>
-          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
-      </tr>
-      <tr>
-          <td colspan="2">出场存油 &nbsp;升</td>
-          <td colspan="2">加注油量 &nbsp;升</td>
-          <td colspan="2">进场存油 &nbsp;升</td>
-          <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 &nbsp;升</td>
-      </tr>
-      <tr>
-          <td rowspan="2">调度章</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2">早班</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2">夜班</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2" colspan="2">交叉</td>
-          <td colspan="2">&nbsp;</td>
-          <td rowspan="2">其他</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-      </tr>
-      <tr>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="2">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-      </tr>
-      <tr>
-          <td rowspan="2">车次</td>
-          <td colspan="2">工号</td>
-          <td rowspan="2">公里耗油</td>
-          <td colspan="2">起讫站</td>
-          <td colspan="4">时间</td>
-          <td colspan="2">误点</td>
-          <td rowspan="2" width="66px">里程(公里)计划</td>
-          <td rowspan="2">备注</td>
-      </tr>
-      <tr>
-          <td colspan="1" width="60px">司&nbsp;机</td>
-          <td colspan="1" width="60px">售&nbsp;票</td>
-          <td colspan="1">起点</td>
-          <td colspan="1">终点</td>
-          <td colspan="1">计发</td>
-          <td colspan="1">实发</td>
-          <td colspan="1">应到</td>
-          <td colspan="1">实到</td>
-          <td colspan="1">快</td>
-          <td colspan="1">慢</td>
-      </tr>
+
 </script>
+<script type="text/html" id="ludan_1">
+	  <tr>
+          <td colspan="14">行车路单</td>
+      </tr>
+      <tr>
+          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
+      </tr>
+      <tr>
+          <td colspan="2">出场存油 &nbsp;升</td>
+          <td colspan="2">加注油量 &nbsp;升</td>
+          <td colspan="2">进场存油 &nbsp;升</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗油 &nbsp;升</td>
+      </tr>
+      <tr>
+          <td rowspan="2">调度章</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">早班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">夜班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2" colspan="2">交叉</td>
+          <td colspan="2">&nbsp;</td>
+          <td rowspan="2">其他</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="2">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td rowspan="2">车次</td>
+          <td colspan="2">工号</td>
+          <td rowspan="2">公里耗油</td>
+          <td colspan="2">起讫站</td>
+          <td colspan="4">时间</td>
+          <td colspan="2">误点</td>
+          <td rowspan="2" width="66px">里程(公里)计划</td>
+          <td rowspan="2">备注</td>
+      </tr>
+      <tr>
+          <td colspan="1" width="60px">司&nbsp;机</td>
+          <td colspan="1" width="60px">售&nbsp;票</td>
+          <td colspan="1">起点</td>
+          <td colspan="1">终点</td>
+          <td colspan="1">计发</td>
+          <td colspan="1">实发</td>
+          <td colspan="1">应到</td>
+          <td colspan="1">实到</td>
+          <td colspan="1">快</td>
+          <td colspan="1">慢</td>
+      </tr>
+</script>
+
 <script type="text/html" id="ludan_2">
+
 	{{each list as obj i}}
+
 		<tr>
+
 			<td>{{i+1}}</td>
+
 			<td>{{obj.jName}}</td>
+
 			<td>{{obj.sName}}</td>
+
 			<td>&nbsp;</td>
+
 			<td>{{obj.qdzName}}</td>
+
 			<td>{{obj.zdzName}}</td>
+
 			<td>{{obj.fcsj}}</td>
+
 			<td>{{obj.fcsjActual}}</td>
+
 			<td>{{obj.zdsj}}</td>
+
 			<td>{{obj.zdsjActual}}</td>
+
 			<td>{{obj.fast}}</td>
+
 			<td>{{obj.slow}}</td>
-			<td>{{obj.jhlc}}</td>
+
+			<td>{{obj.jhlc}}</td>
 			<td>{{obj.remarks}}</td>
+
+		</tr>
+
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
 	{{/if}}
-</script>
-<script type="text/html" id="ludan_3">
-	<tr>
-		<td colspan="2">计划公里</td>
-		<td>{{jhlc}}</td>
-		<td colspan="2">烂班公里</td>
-		<td>{{remMileage}}</td>
-		<td colspan="2">临加公里</td>
-		<td>{{addMileage}}</td>
-		<td colspan="2">营运公里</td>
-		<td colspan="3">{{yygl}}</td>
-	</tr>
-	<tr>
-		<td colspan="2">空驶公里</td>
-		<td>{{ksgl}}</td>
-		<td colspan="2">总公里</td>
-		<td>{{realMileage}}</td>
-		<td colspan="2">计划班次</td>
-		<td>{{jhbc}}</td>
-		<td colspan="2">烂班班次</td>
-		<td colspan="3">{{cjbc}}</td>
-	</tr>
-	<tr>
-		<td colspan="2">增加班次</td>
-		<td>{{ljbc}}</td>
-		<td colspan="2">实际班次</td>
-		<td>{{sjbc}}</td>
-		<td colspan="2"></td>
-		<td></td>
-		<td colspan="2"></td>
-		<td colspan="3"></td>
-	</tr>
-</script>
-<script type="text/html" id="ludan_4">
-		<tr>
-	    <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>
-	    <td>轮胎</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">重点例保项目</td>
-	    <td>1</td>
-	    <td>2</td>
-	    <td>3</td>
-	    <td colspan="3">重点例保项目</td>
-	    <td>1</td>
-	    <td>2</td>
-	    <td>3</td>
-	    <td>灭火机</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">各类制动</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类灯光</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2">出场路码表里程</td>
-	</tr>
-	<tr>
-	    <td colspan="3">方向机</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类仪表</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2" rowspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">欠压报警器</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类皮带</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">发动机清洁及响声</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">油箱及托架</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2">出场路码表里程</td>
-	</tr>
-	<tr>
-	    <td colspan="3">地盘响声</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">轮胎、半轴螺栓螺母</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2" rowspan="3">&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">化油器及油路</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">油、电、水、气</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">进排歧管及排气管</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">内外车身及附件</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>
-	</tr>
+
+</script>
+<script type="text/html" id="ludan_3">
+	<tr>
+		<td colspan="2">计划公里</td>
+		<td>{{jhlc}}</td>
+		<td colspan="2">烂班公里</td>
+		<td>{{remMileage}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
+		<td colspan="2">营运公里</td>
+		<td colspan="3">{{yygl}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">空驶公里</td>
+		<td>{{ksgl}}</td>
+		<td colspan="2">总公里</td>
+		<td>{{realMileage}}</td>
+		<td colspan="2">计划班次</td>
+		<td>{{jhbc}}</td>
+		<td colspan="2">烂班班次</td>
+		<td colspan="3">{{cjbc}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">增加班次</td>
+		<td>{{ljbc}}</td>
+		<td colspan="2">实际班次</td>
+		<td>{{sjbc}}</td>
+		<td colspan="2"></td>
+		<td></td>
+		<td colspan="2"></td>
+		<td colspan="3"></td>
+	</tr>
+</script>
+<script type="text/html" id="ludan_4">
+		<tr>
+	    <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>
+	    <td>轮胎</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">重点例保项目</td>
+	    <td>1</td>
+	    <td>2</td>
+	    <td>3</td>
+	    <td colspan="3">重点例保项目</td>
+	    <td>1</td>
+	    <td>2</td>
+	    <td>3</td>
+	    <td>灭火机</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">各类制动</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类灯光</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2">出场路码表里程</td>
+	</tr>
+	<tr>
+	    <td colspan="3">方向机</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类仪表</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2" rowspan="2">&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">欠压报警器</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类皮带</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">发动机清洁及响声</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">油箱及托架</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2">出场路码表里程</td>
+	</tr>
+	<tr>
+	    <td colspan="3">地盘响声</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">轮胎、半轴螺栓螺母</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2" rowspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">化油器及油路</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">油、电、水、气</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">进排歧管及排气管</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">内外车身及附件</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>
+	</tr>
 </script>
 \ No newline at end of file
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>行车路单</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+						<input class="btn btn-default" type="button" id="query" value="查询"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+						<input class="btn btn-default" type="button" id="print" value="打印"/>
+						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="row">
+					<div class="col-md-3">
+						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
+							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+								<thead>
+									<tr class="hidden">
+										<th>人员</th>
+										<th>自编号</th>
+										<th>路牌</th>
+									</tr>
+								</thead>
+								<tbody>
+									
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-md-9"  id="printArea">
+						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+							<table class="table table-bordered table-checkable" id="forms">
+								<tbody class="ludan_1">
+									
+								</tbody>
+						        <tbody class="ludan_2">
+						        	
+						        </tbody>
+						        <tbody class="ludan_3">
+						        	
+						        </tbody>
+						        <tbody class="ludan_4">
+						        	
+						        </tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
+		/* $('#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>';
+			   }
+			}
+		});
+		 */
+		
+		var date = '';
+		$("#query").on("click",function(){
+			var line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		});
+		
+		var params = new Array();
+		var jName = '';
+		$("#info tbody").on("click","tr",function(){
+			if($(this).children().size() < 2){
+				return;
+			}
+			
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
+			});
+			console.log(params);
+			jName = params[0].split("\\")[0];
+			var id = $("#"+params[1]).val();
+			$get('/realSchedule/'+id,null,function(result){
+				console.log(result);
+			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+				var ludan_1 = template('ludan_1',result);
+				//var ludan_4 = template('ludan_4',result);
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_1').html(ludan_1);
+				//$('#forms .ludan_4').html(ludan_4);
+			});
+			$post('/realSchedule/queryListWaybillQp',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+			    getTime(result);
+				var ludan_2 = template('ludan_2',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_2').html(ludan_2);
+			});
+			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+			    var ludan_3 = template('ludan_3',result);
+			    $('#forms .ludan_3').html(ludan_3);
+			});
+			
+		});
+		
+		$("#export").on("click",function(){
+			if(params.length < 1){
+				return;
+			}
+			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+				window.open("/downloadFile/download?fileName="+jName);
+			});
+		});
+		
+		$("#print").click(function(){
+			$("#printArea").printArea();
+		});
+		
+		$("#exportMore").on("click",function(){
+			return;
+			$post('/realSchedule/exportWaybillMore',{date:date},function(result){
+				window.open("/downloadFile/download?fileName="+jName);
+			});
+		});
+		
+		function getTime(list){
+            $.each(list, function(i, obj) {
+                if(obj.zdsj != null && obj.zdsjActual != null ){
+                    var zdsjActual = (obj.zdsjActual).split(":");
+                    var zdsj = (obj.zdsj).split(":");
+                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    }
+                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    }
+                }
+            }); 
+		}
+	});
+</script>
+<script type="text/html" id="list_info">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+			<td width="32%">{{obj[2]}}</td>
+			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_1">
+	  <tr>
+          <td colspan="14">行车路单</td>
+      </tr>
+      <tr>
+          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
+      </tr>
+      <tr>
+          <td colspan="2">出场存油 &nbsp;升</td>
+          <td colspan="2">加注油量 &nbsp;升</td>
+          <td colspan="2">进场存油 &nbsp;升</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗油 &nbsp;升</td>
+      </tr>
+      <tr>
+          <td rowspan="2">调度章</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">早班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">夜班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2" colspan="2">交叉</td>
+          <td colspan="2">&nbsp;</td>
+          <td rowspan="2">其他</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="2">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td rowspan="2">车次</td>
+          <td colspan="2">工号</td>
+          <td rowspan="2">公里耗油</td>
+          <td colspan="2">起讫站</td>
+          <td colspan="4">时间</td>
+          <td colspan="2">误点</td>
+          <td rowspan="2" width="66px">里程(公里)计划</td>
+          <td rowspan="2">备注</td>
+      </tr>
+      <tr>
+          <td colspan="1" width="60px">司&nbsp;机</td>
+          <td colspan="1" width="60px">售&nbsp;票</td>
+          <td colspan="1">起点</td>
+          <td colspan="1">终点</td>
+          <td colspan="1">计发</td>
+          <td colspan="1">实发</td>
+          <td colspan="1">应到</td>
+          <td colspan="1">实到</td>
+          <td colspan="1">快</td>
+          <td colspan="1">慢</td>
+      </tr>
+</script>
+<script type="text/html" id="ludan_2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sName}}</td>
+			<td>&nbsp;</td>
+			<td>{{obj.qdzName}}</td>
+			<td>{{obj.zdzName}}</td>
+			<td>{{obj.fcsj}}</td>
+			<td>{{obj.fcsjActual}}</td>
+			<td>{{obj.zdsj}}</td>
+			<td>{{obj.zdsjActual}}</td>
+			<td>{{obj.fast}}</td>
+			<td>{{obj.slow}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.remarks}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_3">
+	<tr>
+		<td colspan="2">计划公里</td>
+		<td>{{jhlc}}</td>
+		<td colspan="2">烂班公里</td>
+		<td>{{remMileage}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
+		<td colspan="2">营运公里</td>
+		<td colspan="3">{{yygl}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">空驶公里</td>
+		<td>{{ksgl}}</td>
+		<td colspan="2">总公里</td>
+		<td>{{realMileage}}</td>
+		<td colspan="2">计划班次</td>
+		<td>{{jhbc}}</td>
+		<td colspan="2">烂班班次</td>
+		<td colspan="3">{{cjbc}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">增加班次</td>
+		<td>{{ljbc}}</td>
+		<td colspan="2">实际班次</td>
+		<td>{{sjbc}}</td>
+		<td colspan="2"></td>
+		<td></td>
+		<td colspan="2"></td>
+		<td colspan="3"></td>
+	</tr>
+</script>
+<script type="text/html" id="ludan_4">
+		<tr>
+	    <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>
+	    <td>轮胎</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">重点例保项目</td>
+	    <td>1</td>
+	    <td>2</td>
+	    <td>3</td>
+	    <td colspan="3">重点例保项目</td>
+	    <td>1</td>
+	    <td>2</td>
+	    <td>3</td>
+	    <td>灭火机</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">各类制动</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类灯光</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2">出场路码表里程</td>
+	</tr>
+	<tr>
+	    <td colspan="3">方向机</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类仪表</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2" rowspan="2">&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">欠压报警器</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">各类皮带</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">发动机清洁及响声</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">油箱及托架</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2">出场路码表里程</td>
+	</tr>
+	<tr>
+	    <td colspan="3">地盘响声</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">轮胎、半轴螺栓螺母</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="2" rowspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">化油器及油路</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">油、电、水、气</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="3">进排歧管及排气管</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td colspan="3">内外车身及附件</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	    <td>&nbsp;</td>
+	</tr>
+	<tr>
+	    <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>
+	</tr>
+</script>
 \ No newline at end of file
@@ -56,14 +56,15 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="10%">日期</th>
-								<th width="8%">公司</th>
-								<th width="8%">车辆</th>
+								<th width="10%">公司</th>
+								<th width="10%">分公司</th>
+								<th width="6%">车辆</th>
 								<th width="10%">驾驶员</th>
-								<th width="5%">加注量</th>
-								<th width="5%">加油站</th>
-								<th width="5%">加油类型</th>
+								<th width="2%">加注量</th>
+								<th width="4%">加油站</th>
+								<th width="4%">加油类型</th>
 								<th width="5%">加油工工号</th>
-								<th width="5%">油价</th>
+								<th width="2%">油价</th>
 								<th width="5%">路单工号</th>
 								<th width="4%">备注</th>
 								<th width="19%">操作</th>
@@ -74,7 +75,10 @@
 									<input type="text" id="yyrq" class="form-control form-filter input-sm" name="yyrq">
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm_like">
+<!-- 									<select class="form-control" name="gsdm_like" id="jyryListGsdmId" ></select> -->
+								</td>
+								<td>
+<!-- 									<select class="form-control" name="fgsdm_like" id="jyryListFgsdmId" ></select> -->
 								</td>
 								<td>
 								</td>
@@ -114,7 +118,10 @@
 	</td>
 	<td>{{obj.yyrq}}</td>
 	<td>
-		{{obj.gsdm}}
+		{{obj.gsname}}
+	</td>
+	<td>
+		{{obj.fgsname}}
 	</td>
 	<td>
 		{{obj.nbbm}}
@@ -173,15 +180,54 @@ $(function(){
 		radioClass: 'iradio_square-blue icheck',
 	    increaseArea: '20%'
 	}
-	if($("#yyrq").val()!=""){
-		jsDoQuery(null,true);
-	}
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
-		jsDoQuery(null, true);
+// 		jsDoQuery(null, true);
 	});
+	var gsqx="";
+	var fgsqx="";
+	
+	$.get('/user/companyData', function(result){
+		obj = result;
+		var options = '<option value="">请选择</option>';
+		for(var i = 0; i < obj.length; i++){
+			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			setFgsqx(obj[i].companyCode);
+			gsqx +=obj[i].companyCode+",";
+		}
+		$('#jyryListGsdmId').html(options);
+		updateCompany();
+	});
+	function setFgsqx(gs){
+		var company =gs
+		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++){
+					fgsqx +=children[j].code+",";
+				}
+			}
+		}
+	}
+	$("#jyryListGsdmId").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#jyryListGsdmId').val();
+		var options = '<option value="">请选择</option>';
+		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>';
+				}
+			}
+		}
+		$('#jyryListFgsdmId').html(options);
+	}
+	
+	
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
 		if($("#yyrq").val()!=""){
@@ -216,7 +262,29 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		params['yyrq']=$("#yyrq").val();
-		var i = layer.load(2);
+// 		var i = layer.load(2);
+		
+		var i = 2;
+		/* var jyryGsdm=$("#jyryListGsdmId").val();
+		var jyryFgsdm=$("#jyryListFgsdmId").val();
+		if(jyryGsdm=="" || jyryGsdm==null){
+			params['gsdm_in']=gsqx;
+			params['fgsdm_in']=fgsqx;
+		}else{
+			if(jyryFgsdm==''||jyryFgsdm==null){
+				var fgsqx1='';
+				for(var i = 0; i < obj.length; i++){
+					if(obj[i].companyCode == jyryGsdm){
+						var children = obj[i].children;
+						for(var j = 0; j < children.length; j++){
+							fgsqx1 +=children[j].code+",";
+						}
+					}
+				}
+				params['fgsdm_in']=fgsqx1;
+			}
+		} */
+		
 		$get('/ylxxb/pagequery' ,params, function(data){
 			$.each(data.dataList, function(i, obj) {
                 obj.yyrq = moment(obj.yyrq).format("YYYY-MM-DD");
@@ -140,11 +140,10 @@ $(function(){
 	    checkboxClass: 'icheckbox_flat-blue',
 	    increaseArea: '20%'
 	}
+	
 	var gsqx="";
 	var fgsqx="";
-	
-	
 	$.get('/user/companyData', function(result){
 		obj = result;
 		var options = '<option value="">请选择</option>';
@@ -223,7 +222,6 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		var i = 2;
-		console.log(i);
 		var cylGsdm=$("#cylListGsdmId").val();
 		var cylFgsdm=$("#cylListFgsdmId").val();
 		if(cylGsdm==''|| cylGsdm==null){
@@ -56,18 +56,19 @@
 						id="datatable_cwjy">
 						<thead>
 							<tr role="row" class="heading">
-								<th width="3%">#</th>
+								<th width="2%">#</th>
 								<th width="10%">日期</th>
-								<th width="6%">公司</th>
-								<th width="6%">车辆</th>
-								<th width="12%">驾驶员</th>
-								<th width="5%">加注量</th>
-								<th width="5%">加油站</th>
-								<th width="5%">加油类型</th>
+								<th width="10%">公司</th>
+								<th width="10%">分公司</th>
+								<th width="8%">车辆</th>
+								<th width="8%">驾驶员</th>
+								<th width="3%">加注量</th>
+								<th width="3%">加油站</th>
+								<th width="3%">加油类型</th>
 								<th width="5%">加油工工号</th>
-								<th width="5%">油价</th>
-								<th width="6%">路单工号</th>
-								<th width="5%">备注</th>
+								<th width="3%">油价</th>
+								<th width="4%">路单工号</th>
+								<th width="4%">备注</th>
 								<th width="19%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
@@ -76,10 +77,13 @@
 									<input type="text" id="rq" class="form-control form-filter input-sm" name="rq">
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm_like">
+									<select class="form-control" name="gsdm_like" id="jyglListGsdmId" ></select>								
 								</td>
 								<td>
-									<input type="hidden" class="form-control form-filter input-sm" name="nbbh" id="nbbh">
+									<select class="form-control" name="fgsdm_like" id="jyglListFgsdmId" ></select>
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="nbbh" id="nbbh">
 								</td>
 								<td></td>
 								<td></td>
@@ -117,7 +121,10 @@
 	</td>
 	<td>{{obj.yyrq}}</td>
 	<td>
-		{{obj.gsdm}}
+		{{obj.gsname}}
+	</td>
+		<td>
+		{{obj.fgsname}}
 	</td>
 	<td>
 		{{obj.nbbm}}
@@ -162,7 +169,22 @@ $(function(){
 			params['jsy']=jsy;
 			params['id']=id;
 			$get('/ylxxb/check', params, function(){
-				jsDoQuery(null,true);
+				if($("#rq").val()!=""){
+					var cells = $('tr.filter')[0].cells
+					,params = {}
+					,name;
+				$.each(cells, function(i, cell){
+					var items = $('input,select', cell);
+					for(var j = 0, item; item = items[j++];){
+						name = $(item).attr('name');
+						if(name){
+							params[name] = $(item).val();
+						}
+					}
+				});
+					jsDoQuery(params,true);
+				}
+				
 			});
 		}
 	})
@@ -180,9 +202,64 @@ $(function(){
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
-		jsDoQuery(null, true);
+		if($("#rq").val()!=""){
+			var cells = $('tr.filter')[0].cells
+			,params = {}
+			,name;
+		$.each(cells, function(i, cell){
+			var items = $('input,select', cell);
+			for(var j = 0, item; item = items[j++];){
+				name = $(item).attr('name');
+				if(name){
+					params[name] = $(item).val();
+				}
+			}
+		});
+			jsDoQuery(params, true);
+		}
 	});
+	
+	var gsqx="";
+	var fgsqx="";
+	
+	$.get('/user/companyData', function(result){
+		obj = result;
+		var options = '<option value="">请选择</option>';
+		for(var i = 0; i < obj.length; i++){
+			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			setFgsqx(obj[i].companyCode);
+			gsqx +=obj[i].companyCode+",";
+		}
+		$('#jyglListGsdmId').html(options);
+		updateCompany();
+	});
+	function setFgsqx(gs){
+		var company =gs
+		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++){
+					fgsqx +=children[j].code+",";
+				}
+			}
+		}
+	}
+	$("#jyglListGsdmId").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#jyglListGsdmId').val();
+		var options = '<option value="">请选择</option>';
+		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>';
+				}
+			}
+		}
+		$('#jyglListFgsdmId').html(options);
+	}
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
 		if($("#rq").val()!=""){
@@ -217,10 +294,30 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		params['rq']=$("#rq").val();
-		var i = layer.load(2);
+		
+		var i = 2;
+		var jyglGsdm=$("#jyglListGsdmId").val();
+		var jyglFgsdm=$("#jyglListFgsdmId").val();
+		if(jyglGsdm=="" || jyglGsdm==null){
+			params['gsdm_in']=gsqx;
+			params['fgsdm_in']=fgsqx;
+		}else{
+			if(jyglFgsdm==''||jyglFgsdm==null){
+				var fgsqx1='';
+				for(var i = 0; i < obj.length; i++){
+					if(obj[i].companyCode == jyglGsdm){
+						var children = obj[i].children;
+						for(var j = 0; j < children.length; j++){
+							fgsqx1 +=children[j].code+",";
+						}
+					}
+				}
+				params['fgsdm_in']=fgsqx1;
+			}
+		}
 		$get('/cwjy/pagequery' ,params, function(data){
 			$.each(data.dataList, function(i, obj) {
-                obj.yyrq = moment(obj.yyrq).format("YYYY-MM-DD");
+                obj.yyrq = $("#rq").val();
             });
 			var bodyHtm = template('jygl_list_temp', {list: data.dataList});
 			$('#datatable_cwjy tbody').html(bodyHtm)
@@ -271,22 +368,11 @@ $(function(){
 		    		return;
 		    	}	
 		    	page = num - 1;
-		    	var cells = $('tr.filter')[0].cells
-				,params = {}
-				,name;
-			$.each(cells, function(i, cell){
-				var items = $('input,select', cell);
-				for(var j = 0, item; item = items[j++];){
-					name = $(item).attr('name');
-					if(name){
-						params[name] = $(item).val();
-					}
-				}
-			});
-			page = 0;
-			jsDoQuery(params, true);
+		    	
+			jsDoQuery(null, false);
 		    }
 		});
+		
 	}