车辆监控数据，上报页面车辆信息显示时也加上托管车辆标识

src/main/java/com/hb/proj/car/service/CarOilMonitorService.java

@@ -101,7 +101,7 @@ public class CarOilMonitorService {
 		List<Object> sqlParams=new ArrayList<Object>();
 		StringBuilder sql=new StringBuilder(100);
 		sql.append("select * from (");
-		sql.append("select g.assist_code,g.org_name belong_org_name,t.car_num,t.custom_num,t.device_model,t.device_name,t.discard_if,");
+		sql.append("select g.assist_code,g.org_name belong_org_name,t.car_num,t.custom_num,t.device_model,t.device_name,t.discard_if,t.custom_tag,");
 		sql.append(" oil_type,m.box_num,c.*");
 		sql.append(" from t_oil_change c inner join t_car t on c.car_id=t.car_id");
 		sql.append(" left join t_oil_meter m on c.mount_id=m.record_id");
@@ -146,7 +146,7 @@ public class CarOilMonitorService {
 		List<Object> sqlParams=new ArrayList<Object>();
 		StringBuilder sql=new StringBuilder(100);
 		sql.append("select * from (");
-		sql.append("select m.box_num,box_name,r.*,t.car_num,t.custom_num,t.device_model,t.device_name,t.oil_type,consume.rpt_volume,(IFNULL(consume.rpt_volume,0)-IFNULL(add_volume,0)) diff_volume,g.org_name belong_org_name,g.assist_code ");
+		sql.append("select m.box_num,box_name,r.*,t.car_num,t.custom_num,t.device_model,t.device_name,t.oil_type,t.custom_tag,consume.rpt_volume,(IFNULL(consume.rpt_volume,0)-IFNULL(add_volume,0)) diff_volume,g.org_name belong_org_name,g.assist_code ");
 		sql.append(" from t_oil_monitor_report r ");
 		sql.append(" left join t_oil_meter m on r.mount_id=m.record_id");
 		sql.append(" inner join t_car t on m.belong_car_id=t.car_id and t.discard_if=0");

src/main/java/com/hb/proj/car/service/CarService.java

@@ -137,7 +137,7 @@ public class CarService {
 		List<Object> sqlParams=new ArrayList<Object>();
 		StringBuilder sql=new StringBuilder(300);
 		sql.append("select DATE_FORMAT(work_start,'%Y-%m') wk_start,tab.custom_num,car.car_num,car.car_id,r.oil_type,r.device_name,r.device_model, "); //select 后的字段为必要内容不能删减
-		sql.append(" car.quota_alternator_id,car.quota_rule_id");
+		sql.append(" car.quota_alternator_id,car.quota_rule_id,car.custom_tag");
 		sql.append(" from(");
 		sql.append(" select distinct car_id,custom_num from t_car_transfer  t1 ");
 		sql.append(" left join t_org g on t1.belong_org=g.org_id ");

src/main/webapp/css/querytab.css

@@ -24,4 +24,12 @@ body{
 	font-size: 30px;
 	color: #01AAED;
 	margin:0px 10px;
+}
+
+.discard-car{
+	color:#ff0000;
+}
+
+.outside-car{
+	color:#0f6ade;
 }

src/main/webapp/page/js/carConsumeInput.js

@@ -61,7 +61,13 @@ layui.use(['element','layer','newtable','laydate','myform','validator','page','l
 		  					 where:{rptMonth:$("#rptMonth").val()},
 		  					 cols:[[
 								 {type: 'numbers', title: '序号', width: '40',fixed: 'left'},
-								 {field: 'customNum', title: '自编号', width:90,fixed: 'left'},
+								 {field: 'customNum', title: '自编号', width:90,fixed: 'left',templet:function(d){
+									 let cls=d.discardIf==1?'discard-car':'';
+									 if("是"==d.customTag){
+										 cls=cls+" outside-car";
+									 }
+									 return "<div class=\""+cls+"\">"+d.customNum+"</div>";
+								 }},
 		  						 {field: 'carNum', title: '车牌', width:120,fixed: 'left'},
 		  						 {field: 'oilType', title: '燃油类型', width:90,align:'center',fixed: 'left'},
 								 {field: 'rptMonth', title: '上报月份', width:100,align:'center',fixed: 'left',templet:function(d){

src/main/webapp/page/js/oilDataQuery.js

@@ -22,7 +22,13 @@ layui.use(['element','mylayer','newtable','laydate','myform','page','autocomplet
 				  					 limits:[50,100,200],
 				  					 cols:[[
 										 {type: 'numbers', title: '序号', width: '60',fixed: 'left'},
-										 {field: 'customNum', title: '自编号', width:120,fixed: 'left'},
+										 {field: 'customNum', title: '自编号', width:120,fixed: 'left',templet:function(d){
+											 let cls=d.discardIf==1?'discard-car':'';
+											 if("是"==d.customTag){
+												 cls=cls+" outside-car";
+											 }
+											 return "<div class=\""+cls+"\">"+d.customNum+"</div>";
+										 }},
 										 {field: 'carNum', title: '牌照号', width:120,fixed: 'left'},
 				  						 {field: 'belongOrgName', title: '所属单位', width:180,align:'center'},
 				  						 {field: 'deviceName', title: '设备名称', width:220,sort:true},

src/main/webapp/page/js/oilExceptionQuery.js

@@ -29,7 +29,13 @@ layui.use(['element','mylayer','newtable','laydate','myform','page','autocomplet
 				  					 limits:[50,100,200],
 				  					 cols:[[
 										 {type: 'numbers', title: '序号', width: '60',fixed: 'left'},
-										 {field: 'customNum', title: '自编号', width:120,fixed: 'left'},
+										 {field: 'customNum', title: '自编号', width:120,fixed: 'left',templet:function(d){
+											 let cls=d.discardIf==1?'discard-car':'';
+											 if("是"==d.customTag){
+												 cls=cls+" outside-car";
+											 }
+											 return "<div class=\""+cls+"\">"+d.customNum+"</div>";
+										 }},
 										 {field: 'carNum', title: '牌照号', width:120,fixed: 'left'},
 				  						 {field: 'belongOrgName', title: '所属单位', width:180,align:'center'},
 				  						 {field: 'deviceName', title: '设备名称', width:220},

src/main/webapp/page/js/oilMonitorRpt.js

@@ -50,7 +50,13 @@ layui.use(['element','mylayer','newtable','laydate','myform','page','autocomplet
 				  					 limits:[50,100,200],
 				  					 cols:[[
 										 {type: 'numbers', title: '序号', width: '40',fixed: 'left'},
-										 {field: 'customNum', title: '自编号', width:80,fixed: 'left'},
+										 {field: 'customNum', title: '自编号', width:80,fixed: 'left',templet:function(d){
+											 let cls=d.discardIf==1?'discard-car':'';
+											 if("是"==d.customTag){
+												 cls=cls+" outside-car";
+											 }
+											 return "<div class=\""+cls+"\">"+d.customNum+"</div>";
+										 }},
 										 {field: 'carNum', title: '牌照号', width:100,fixed: 'left'},
 										 {field: 'belongOrgName', title: '所属单位', width:180,align:'center'},
 				  						 {field: 'deviceName', title: '设备名称', width:220},

src/main/webapp/page/oilcollect/oilDataQuery.html

@@ -7,6 +7,7 @@
 		<link rel="stylesheet" href="../../js/layui/css/layui.css"/>
 		<link rel="stylesheet" href="../../js/layui/css/modules/autocomplete/autocomplete.css"/>
 		<link rel="stylesheet" href="../../css/querytab.css"/>
+		
 	</head>
 	<body>
 		<div class="layui-fluid">