|  | @@ -135,34 +135,68 @@ $(document).ready(function() {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      //新增定额库
 | 
	
		
			
				|  |  |      $("#add-ration").click(function () {
 | 
	
		
			
				|  |  | -         let rationLib = $("select[name='ration_lib']").children("option:selected").val();
 | 
	
		
			
				|  |  | -         let rationLibString = $("select[name='ration_lib']").children("option:selected").text();
 | 
	
		
			
				|  |  | -         if(rationLib == undefined || rationLib ==''){
 | 
	
		
			
				|  |  | -             alert("请选择定额库");
 | 
	
		
			
				|  |  | -             return;
 | 
	
		
			
				|  |  | -         }
 | 
	
		
			
				|  |  | -        if($("input:hidden[name=ration_lib][data-id = "+rationLib+"]").length <= 0){
 | 
	
		
			
				|  |  | +        let rationLib = $("select[name='ration_lib']").children("option:selected").val();
 | 
	
		
			
				|  |  | +        let rationLibString = $("select[name='ration_lib']").children("option:selected").text();
 | 
	
		
			
				|  |  | +        if (rationLib == undefined || rationLib == '') {
 | 
	
		
			
				|  |  | +            alert("请选择定额库");
 | 
	
		
			
				|  |  | +            return;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        if ($("input:hidden[name=ration_lib][data-id = " + rationLib + "]").length <= 0) {
 | 
	
		
			
				|  |  |              let tem = {
 | 
	
		
			
				|  |  | -                id:rationLib,
 | 
	
		
			
				|  |  | -                name:rationLibString,
 | 
	
		
			
				|  |  | -                isDefault:false
 | 
	
		
			
				|  |  | +                id: rationLib,
 | 
	
		
			
				|  |  | +                name: rationLibString,
 | 
	
		
			
				|  |  | +                isDefault: false
 | 
	
		
			
				|  |  |              };
 | 
	
		
			
				|  |  |              let htmlString = ` 
 | 
	
		
			
				|  |  | -                <tr class='ration_tr'>
 | 
	
		
			
				|  |  | -                     <td><span>${tem.name}</span></td>
 | 
	
		
			
				|  |  | -                     <td><label class="form-check-label"> <input class="form-check-input" name="ration_isDefault"  value="${tem.id}" type="radio"></td>  
 | 
	
		
			
				|  |  | -                     <td>
 | 
	
		
			
				|  |  | -                            <a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTableTr(this,"ration_tr")'>删除</a>
 | 
	
		
			
				|  |  | -                            <input type="hidden" name="ration_lib" data-id="${tem.id}" value='${JSON.stringify(tem)}'>
 | 
	
		
			
				|  |  | -                      </td>
 | 
	
		
			
				|  |  | +                <tr class='ration_tr' draggable="true">
 | 
	
		
			
				|  |  | +                    <td><span class="default-cursor">${tem.name}</span></td>
 | 
	
		
			
				|  |  | +                    <td><label class="form-check-label"> <input class="form-check-input" name="ration_isDefault"  value="${tem.id}" type="radio"></td>  
 | 
	
		
			
				|  |  | +                    <td>
 | 
	
		
			
				|  |  | +                        <a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTableTr(this,"ration_tr")'>删除</a>
 | 
	
		
			
				|  |  | +                        <input type="hidden" name="ration_lib" data-id="${tem.id}" value='${JSON.stringify(tem)}'>
 | 
	
		
			
				|  |  | +                    </td>
 | 
	
		
			
				|  |  |                  </tr>`
 | 
	
		
			
				|  |  |              $("#ration_tbody").append(htmlString);
 | 
	
		
			
				|  |  | -        }else {
 | 
	
		
			
				|  |  | +        } else {
 | 
	
		
			
				|  |  |              alert('已存在相同的定额库')
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          $("#addRation").modal('hide');
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    // 拖动排序
 | 
	
		
			
				|  |  | +    const dragSelector = '.ration_tr[draggable=true]';
 | 
	
		
			
				|  |  | +    const rationBodySelector = '#ration_tbody';
 | 
	
		
			
				|  |  | +    let dragged;
 | 
	
		
			
				|  |  | +    // 动态绑定(新增的也能监听到)
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('dragstart', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        dragged = this;
 | 
	
		
			
				|  |  | +        $(this).addClass('dragging');
 | 
	
		
			
				|  |  | +        ev.originalEvent.dataTransfer.effectAllowed = 'move';
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('dragend', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        $(this).removeClass('dragging');
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('dragover', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        ev.preventDefault(); // 必须调用此方法,否则drop事件不触发
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('dragenter', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        if (this !== dragged) {
 | 
	
		
			
				|  |  | +            $(this).addClass('highlight');
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('dragleave', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        if (this !== dragged) {
 | 
	
		
			
				|  |  | +            $(this).removeClass('highlight');
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    $(rationBodySelector).on('drop', dragSelector, function (ev) {
 | 
	
		
			
				|  |  | +        $(this).removeClass('highlight');
 | 
	
		
			
				|  |  | +        $(this).after($(dragged));
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  | +    
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      // 新增计价规则
 | 
	
		
			
				|  |  |      $("#add-valuation").click(function() {
 | 
	
		
			
				|  |  |          try {
 |