电量平衡表添加新增删除

月存油报表添加分公司

电量平衡表添加新增删除
月存油报表添加分公司
廖磊
1 parent fc20d76f
Showing 11 changed files with 658 additions and 45 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/electricity/list/add.html
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/report/oil/oilListMonth.html
@@ -2,6 +2,7 @@ package com.bsth.controller.oil;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -194,4 +195,30 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	}
+	
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=service.checkJsy(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= service.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
+	
+	@RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
+	public Map<String, Object> saveDlb(Dlb t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setCreatetime(new Date());
+//		Ylb t=new Ylb();
+		return service.saveDlb(t);
+	}
 }
@@ -209,8 +209,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
-		return yblService.oilListMonth(line, date, type);
+	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
+		return yblService.oilListMonth(map);
 	}
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
@@ -20,4 +20,12 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
 	String obtainDsq() throws Exception;
+	
+	String checkJsy(Map<String, Object> map);
+	
+	Map<String, Object> saveDlb(Dlb t);
+	
+	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
+
+
 }
@@ -19,7 +19,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
-	List<Ylb> oilListMonth(String line,String date,String type);
+	List<Ylb> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
@@ -1032,6 +1032,87 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return lists;
 	}
+	
+	
+	@Override
+	public String checkJsy(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("date").toString();
+		String nbbm=map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
+		String xlbm=map.get("xlbm").toString();
+		List<Dlb> list= repository.queryListDlb(rq, nbbm, jsy, xlbm);
+		String type="1";
+		if(list.size()>0){
+			type="0";
+		}
+		return type;
+	}
+
+	@Override
+	public Map<String, Object> saveDlb(Dlb t) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map = new HashMap<>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=sdf.format(t.getRq());
+		String gsdm=t.getSsgsdm();
+		String fgsdm=t.getFgsdm();
+		String xlbm=t.getXlbm();
+		String jhsj=t.getJhsj();
+		String jsy=t.getJsy();
+		String nbbm=t.getNbbm();
+		int sfkt=t.getSfkt();
+		t.setCreatetime(new Date());
+		String[] jhsjStr = jhsj.split(":");
+		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
+		List<Dlb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		int jcsx=1;
+		if(list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Dlb y=list.get(i);
+				String[] fcsjStr = y.getJhsj().split(":");
+				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+				if(fcsjL>fcsj){
+					jcsx=jcsx+y.getJcsx();
+				}else{
+					y.setJcsx(y.getJcsx()+1);
+					repository.save(y);
+				}
+			}
+			
+		}
+		t.setJcsx(jcsx);
+		repository.save(t);
+		map.put("status", ResponseCode.SUCCESS);
+        map.put("t", t);
+		return map;
+	}
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> maps = new HashMap<>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Integer id =jsonObject.getInteger("id");
+			repository.delete(id);
+		}
+		maps.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			maps.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return maps;
+	}
+	
 }
 class NbbmJcsxMap implements Comparator<Map<String, Object>>{
@@ -977,17 +977,24 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
-	public List<Ylb> oilListMonth(String line, String date, String type) {
+	public List<Ylb> oilListMonth(Map<String, Object> map) {
+		String type=map.get("type").toString();
+		String date=map.get("date").toString().trim();
+		String gsdm=map.get("gsdm").toString();
+		String fgsdm=map.get("fgsdm").toString();
 		String date2=date.substring(0, 8)+"01";
 		String lineStr="";
+		String line =map.get("line").toString().trim();
 		if(line !=null && !line.equals("")){
 			lineStr =" and xlbm= '"+ line +"'";
+		}else{
+			lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
 		}
 		String sql="select a.nbbm,a.rq,a.jzyl from (" +
 				" select x.nbbm,max(x.rq) as rq,max(x.jcsx) as jcsx from "
 				+ "(select nbbm,rq,max(jcsx)  as jcsx from bsth_c_ylb  where rq between  '"
 				+ date2 +"'  and '" + date+"' "+lineStr
-				+ "group by   nbbm,rq)  x group by x.nbbm ) b" 
+				+ " group by   nbbm,rq)  x group by x.nbbm ) b" 
 				+ "	left join (select nbbm,rq,jzyl,jcsx  FROM   bsth_c_ylb  "
 				+ "	where rq between  '"
 				+ date2 +"'  and '" + date+"' "+lineStr
@@ -2775,25 +2775,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         for (int i = 0; i < newList.size(); i++) {
             ScheduleRealInfo t1 = newList.get(i);
-            String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
-            if(reamrks1.length()>5){
-            	t1.setRemarks(reamrks1.substring(0, 5));
-            	t1.setRemark(reamrks1);
-            }
             for (int j = 0; j < list.size(); j++) {
                 ScheduleRealInfo t2 = list.get(j);
-                String reamrks2=t2.getRemarks()==null?"":t2.getRemarks();
-                if(reamrks2.length()>5){
-                	t2.setRemarks(reamrks2.substring(0, 5));
-                	t2.setRemark(reamrks2);
-                }else{
-                	t2.setRemark(reamrks2);
-                }
                 if (t1.getId() == t2.getId()) {
                     t1 = t2;
                 }
             }
         }
+        
+        for (int i = 0; i < newList.size(); i++) {
+        	ScheduleRealInfo t1=newList.get(i);
+    	    String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
+            if(reamrks1.length()>4){
+	          	t1.setRemarks(reamrks1.substring(0,4));
+	          	t1.setRemark(reamrks1);
+            }else{
+          	    t1.setRemark(reamrks1);
+            }
+		}
         return newList;
     }
@@ -2973,28 +2972,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
         }
-        List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
+       /* List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < yesterdayDataList.size(); i++) {
         	Map<String, Object> map=yesterdayDataList.get(i);
         	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-        	 if(zlc>0){
+//        	 if(zlc>0){
         		 yesterdayDataLists.add(map);
-        	 }
-        }
+//        	 }
+        }*/
         //增加顺序号
-        for (int i = 0; i < yesterdayDataLists.size(); i++) {
+        for (int i = 0; i < yesterdayDataList.size(); i++) {
             if (i == 0) {
-            	yesterdayDataLists.get(i).put("seqNumber", 1);
+            	yesterdayDataList.get(i).put("seqNumber", 1);
             } else {
-                if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
-                	yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
+                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
+                	yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
                 } else {
-                	yesterdayDataLists.get(i).put("seqNumber", 1);
+                	yesterdayDataList.get(i).put("seqNumber", 1);
                 }
             }
         }
-        return yesterdayDataLists;
+        return yesterdayDataList;
     }
     /**
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站电量量信息编辑</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">用电管理</span> <i class="fa fa-circle"></i></li>
+	<li><a href="list.html" data-pjax>进出场电量</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">进出站电量信息编辑</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase">表单</span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="ssgsdm" id="ssgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">分公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="fgsdm" id="fgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">线路</label>
+					<div class="col-md-4">
+							<select class="form-control" name="xlbm" id="xlbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">内部编码</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="nbbm" id="nbbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">日期</label>
+					<div class="col-md-4">
+							<input type="text" class="form-control" name="rq" id="date">
+							<label>跨天营运</label>
+							<select id="sfkt" name="sfkt">
+								<option value="0">否</option>
+								<option value="1">是</option>
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">开始营运时间</label>
+					<div class="col-md-4">
+							<input type="time" class="form-control" name="jhsj" >
+							<span class="help-block"> 如：12:12</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">驾驶员</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="jsy" id="jsy"> </select>
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场电量%</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="czcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">充电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="cdl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场电量%</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="jzcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">耗电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="hd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">尿素</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗原因</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="shyy">
+								<option value='0'>请选择</option> 
+								<option value='1'>票务用油</option> 
+								<option value='2'>保养用油</option> 
+								<option value='3'>报废车用油</option> 
+								<option value='4'>其它用油</option> 
+								<option value='5'>人保部</option> 
+								<option value='6'>车队</option> 
+								<option value='7'>车间(高保)</option> 
+								<option value='8'>车间(小修)</option> 
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">行驶总里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				
+			</div>
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-3 col-md-4">
+						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
+						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+					</div>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	var fage=false;
+	var obj = [];
+	var xlList;
+	$.get('/report/lineList',function(result){
+		xlList=result;
+		$.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>';
+			}
+			$('#ssgsdm').html(options);
+			
+			updateCompany();
+		});
+	});
+
+	$("#ssgsdm").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#ssgsdm').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>';
+				}
+			}
+		}
+		$('#fgsdm').html(options);
+		initXl();
+		selectNbbm();
+		selectJsy();
+	}
+	$("#fgsdm").on("change",initXl);
+	function initXl(){
+		var data=[];
+		if(fage){
+			$("#xlbm").select2("destroy").html('');
+		}
+		var fgs=$('#fgsdm').val();
+		var gs=$('#ssgsdm').val();
+		for(var i=0;i<xlList.length;i++){
+			if(gs!=""){
+				if(fgs!=""){
+					if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}else{
+					if(xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}
+			}
+		}
+		initPinYinSelect2('#xlbm',data,'');
+		fage=true;
+		selectNbbm();
+		selectJsy();
+	}
+	$("#date").datetimepicker({
+		format : 'YYYY-MM-DD',
+		locale : 'zh-cn'
+	});
+	
+	function selectNbbm(){
+		$('#nbbm').select2({
+			placeholder: '搜索车辆...',
+			ajax: {
+				url: '/report/carList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{nbbm: params.term,
+	            	    gsbm:$('#ssgsdm').val(),
+	            	    fgsbm:$('#fgsdm').val(),
+	            	    xlbm:""
+	            	    };
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</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 selectJsy(){
+		$('#jsy').select2({
+			placeholder: '搜索驾驶员...',
+			ajax: {
+				url: '/report/userList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{jsy: params.term,gsbm:$('#ssgsdm').val()};
+				},
+			    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(){
+			/* $get('/role/all',null,function(result){
+				$.each(result,function(i,obj){
+					$("#role").append("<option value='"+obj.id+"'>"+obj.roleName+"</option>");
+				});
+			}); */
+			
+			var form = $('#ylb_add_form');
+			var error = $('.alert-danger', form);
+			
+			//表单 validate
+			form.validate({
+				errorElement : 'span', 
+				errorClass : 'help-block help-block-error', 
+				focusInvalid : false, 
+				rules : {
+					'xlbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'nbbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'rq' : {
+						required : true,
+						maxlength: 25
+					},
+					'jsy' : {
+						required : true,
+						maxlength: 20
+					}
+				},
+				invalidHandler : function(event, validator) {         
+					error.show();
+					App.scrollTo(error, -200);
+				},
+
+				highlight : function(element) { 
+					$(element).closest('.form-group').addClass('has-error'); 
+				},
+
+				unhighlight : function(element) { 
+					$(element).closest('.form-group').removeClass('has-error'); 
+				},
+
+				success : function(label) {
+					label.closest('.form-group').removeClass('has-error'); 
+				},
+
+				submitHandler : function(f) {
+					var params = form.serializeJSON();
+					error.hide();
+					var nbbm=$("#nbbm").val();
+					var date=$("#date").val();
+					var jsy=$("#jsy").val();
+					var xlbm=$("#xlbm").val();
+					var map={};
+					map["nbbm"]=nbbm;
+					map["date"]=date;
+					map["jsy"]=jsy;
+					map["xlbm"]=xlbm;
+					//检查一下用户是否存在
+						$get('/dlb/checkJsy', map, function(fage){
+							if(fage=="0"){
+								layer.msg('该驾驶员当天已存在.');
+							}else{
+								$post('/dlb/saveDlb', params, function(){
+									layer.msg('添加信息成功.');
+									loadPage('list.html');
+								});
+							}
+					});
+				}
+			});
+		});
+})();
+</script>
 \ No newline at end of file
@@ -23,6 +23,9 @@
                       <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
                         	保存
                     </button>
+                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
+                    
                     <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
                   	   获取加/存电信息
                     </button>
@@ -677,7 +680,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         }
-        //删除
+      //删除
         $('#removeButton').on('click', function () {
         	var idArray = [];
         	var x=0;
@@ -697,7 +700,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	            if(confirm('确定要删除选中的数据？')) 
 	            { 
 	            	 var i = layer.load(2);
-	            	 $post('/ylb/deleteIds', params, function (result) {
+	            	 $post('/dlb/deleteIds', params, function (result) {
 	            		 layer.close(i);
 	            		 var params=getParamsList();
 		            	  jsDoQuery(params, true);
@@ -705,17 +708,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	            } 
 	       	 }
         });
-
-        //搜索线路
-       /* 	$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			data.push({id: " ", text: "全部线路"});
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#xlbm',data,'');
-			
-		}) */
 		$("#ylbListFgsdmId").on("change",initXl);
 <div class="page-head">
 	<div class="page-title">
-		<h1>进场站油量信息编辑</h1>
+		<h1>进出站油量信息编辑</h1>
 	</div>
 </div>
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
-	<li><a href="list_ph.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">进场站油量信息编辑</span></li>
+	<li><a href="list_ph.html" data-pjax>进出场油量</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">进出站油量信息编辑</span></li>
 </ul>
 <div class="portlet light bordered">
@@ -27,6 +27,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
+					<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
+							<span class="item-label" style="width: 80px;">公司: </span>
+							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+						</div> 
+						<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
+							<span class="item-label" style="width: 80px;">分公司: </span>
+							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
@@ -105,7 +113,7 @@
 			$("#date").val(year + "-0" + month + "-" + day);
 		}
-		var tempData = {};
+		/* var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
 			$.get('/user/companyData', function(result){
@@ -125,7 +133,86 @@
 				initPinYinSelect2('#line',data,'');
 			});
+		}); */
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			
+			$.get('/user/companyData', function(result){
+				obj = result;
+				console.log(obj);
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv').css('display','none');
+				}
+				$('#gsdm').html(options);
+				
+				updateCompany();
+			});
 		});
+
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').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>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+
+			var tempData = {};
+			$.get('/report/lineList',function(xlList){
+				var data = [];
+				data.push({id: " ", text: "全部线路"});
+				$.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,'');
+					
+				});
+			});
+			
+			$("#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);
+				}
+			});
+		}
+		
 		//查询
@@ -136,7 +223,9 @@
 			}
 			var line = $("#line").val();
 			var date = $("#date").val();
-			$get('/ylb/oilListMonth',{line:line,date:date,type:'query'},function(result){
+			var gsdm = $("#gsdm").val();
+			var fgsdm = $("#fgsdm").val();
+			$get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
 // 				$.each(result, function(i, obj) {
 // 	                obj.rq = moment(obj.rq).format("DD");
 // 	            });