ylb

廖磊
1 parent af4467ff
Showing 2 changed files with 21 additions and 49 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/list.html
@@ -373,7 +373,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				if(t.getJcsx()==1){
 					Double jcyl=t.getCzyl();
 					zyl=jcyl+jzl-yl;
-					Double yh=Double.parseDouble(df.format(zyl*(t.getZlc()/zlc)));
+					Double yh=0.0;
+					if(zlc>0&&t.getZlc()>0){
+						yh=Double.parseDouble(df.format(zyl*(t.getZlc()/zlc)));
+					}
 					t.setYh(yh);
 					nextJzyl=t.getJzl()+t.getCzyl()-yh;
 					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
@@ -10,7 +10,7 @@
     <li><span class="active">进出场存油量</span></li>
 </ul>
  
-<div class="row" id="liaolei_oil_list">
+<div class="row" id="ll_oil_list">
     <div class="col-md-12">
         <!-- Begin: life time stats -->
         <div class="portlet light portlet-fit portlet-datatable bordered">
@@ -214,7 +214,7 @@
 <script>
     $(function () {
         //var id = 15;
-        //$('.in_carpark_jzyl[data-id='+id+']', '#liaolei_oil_list')
+        //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
  
         $("#checkYl").on('click', function () {
             console.log("核对加注量");
@@ -264,14 +264,16 @@
         })
         //拆分
         $("#sortButton").on('click', function () {
-            console.log("拆分油量");
             if ($("#rq").val() != "") {
                 var id = $('input.icheck:checked').data('id');
+               
                 if (typeof(id) == 'undefined') {
                     layer.msg("请选择一行进行拆分");
                 } else {
                     //获取输入的进场存油
-                    var jzyl = $("#jzyl" + id).html();
+                    var jzyl =  $('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
+                   // $("#jzyl" + id).html();
+                   console.log(jzyl);
                     var params = {};
                     params['jzyl'] = jzyl;
                     params['id'] = id;
@@ -357,12 +359,10 @@
             if (p)
                 params = p;
             //更新时间排序
-            console.log(params);
             params['order'] = 'nbbm';
             params['page'] = page;
             params['rq'] = $("#rq").val();
             var i = layer.load(2);
-            console.log(params);
             $get('/ylb', params, function (data) {
                 $.each(data.content, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
@@ -379,7 +379,7 @@
                 }
                 layer.close(i);
  
-                startOptJzylLink($('#liaolei_oil_list .in_carpark_jzyl'));
+                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
             });
         }
  
@@ -466,47 +466,16 @@
         });
  
         //搜索线路
-        $('#xlbm').select2({
-            placeholder: '搜索线路...',
-            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>';
-                }
-            }
-        });
+       	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#xlbm',data,'');
+			
+		})
  
         $('#nbbm').select2({
             placeholder: '搜索车辆...',