|  | @@ -76,7 +76,7 @@
 | 
	
		
			
				|  |  |                                  <!-- 遍历操作 -->
 | 
	
		
			
				|  |  |                                  <td class="td-manage text-c">
 | 
	
		
			
				|  |  |                                      <#if machineIsPrint == '1'>
 | 
	
		
			
				|  |  | -                                    <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a>
 | 
	
		
			
				|  |  | +                                    <a onclick="updatePrint('${list.machineBarcode}',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a>
 | 
	
		
			
				|  |  |                                      </#if>
 | 
	
		
			
				|  |  |                                      <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a>
 | 
	
		
			
				|  |  |                                  </td>
 | 
	
	
		
			
				|  | @@ -191,7 +191,11 @@
 | 
	
		
			
				|  |  |                                      '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
 | 
	
		
			
				|  |  |                                      '</div>');
 | 
	
		
			
				|  |  |                          }
 | 
	
		
			
				|  |  | -                        /*updatePrint(machineBarcode);*/
 | 
	
		
			
				|  |  | +                        if(${machineIsPrint} == '1')
 | 
	
		
			
				|  |  | +                        {
 | 
	
		
			
				|  |  | +                            updatePrint(machineBarcode,false);
 | 
	
		
			
				|  |  | +                            $("#" + machineBarcode).remove();
 | 
	
		
			
				|  |  | +                        }
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                  });
 | 
	
		
			
				|  |  |                  numbers = numbers - parseInt(settingNumber);
 | 
	
	
		
			
				|  | @@ -246,7 +250,7 @@
 | 
	
		
			
				|  |  |                                      '<td class="text-c" style="font-size: 24px" width="10">'+private+'</td>' +
 | 
	
		
			
				|  |  |                                              '<td class="text-c" width="10">'+value.machineBarcode+'</td>' +
 | 
	
		
			
				|  |  |                                              '<td class="text-c" width="10">'+machineType+'</td>' +
 | 
	
		
			
				|  |  | -                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a>' +
 | 
	
		
			
				|  |  | +                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a>' +
 | 
	
		
			
				|  |  |                                              '<a onclick="barCodePrint('+value.machineBarcode+value.machineQrcode+value.machineProduceType+','+value.machineId+');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont"></i></a> </td></tr>');
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -263,7 +267,7 @@
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -                function updatePrint(machineBarcode){
 | 
	
		
			
				|  |  | +                function updatePrint(machineBarcode,type){
 | 
	
		
			
				|  |  |                      $.ajax({
 | 
	
		
			
				|  |  |                          "type" : "post",
 | 
	
		
			
				|  |  |                          "url" : "${path}/admin/machine/_update_print",
 | 
	
	
		
			
				|  | @@ -271,7 +275,9 @@
 | 
	
		
			
				|  |  |                          "data" :{machineBarcode : machineBarcode},
 | 
	
		
			
				|  |  |                          "success" : function(data) {
 | 
	
		
			
				|  |  |                              $("#"+machineBarcode).remove();
 | 
	
		
			
				|  |  | -                            layer.msg('修改成功', {icon: 1, time: 2000});
 | 
	
		
			
				|  |  | +                            if(type){
 | 
	
		
			
				|  |  | +                                layer.msg('修改成功', {icon: 1, time: 2000});
 | 
	
		
			
				|  |  | +                            }
 | 
	
		
			
				|  |  |                          },
 | 
	
		
			
				|  |  |                          "error":function(data){
 | 
	
		
			
				|  |  |                              layer.msg('操作失败', {icon: 2, time: 2000});
 | 
	
	
		
			
				|  | @@ -296,6 +302,7 @@
 | 
	
		
			
				|  |  |                      /*"data" :{machineBarcodes : JSON.stringify(a)},*/
 | 
	
		
			
				|  |  |                      "success" : function(data) {
 | 
	
		
			
				|  |  |                          layer.msg('修改成功!', {icon: 1,time:2000});
 | 
	
		
			
				|  |  | +                        location.replace(location.href);
 | 
	
		
			
				|  |  |                      },
 | 
	
		
			
				|  |  |                      "error":function(data){
 | 
	
		
			
				|  |  |                          /*alert("操作失败,请联系管理员!");*/
 | 
	
	
		
			
				|  | @@ -357,9 +364,15 @@
 | 
	
		
			
				|  |  |                                  '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
 | 
	
		
			
				|  |  |                                  '</div>');
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  |                  $("#printlist").printArea();
 | 
	
		
			
				|  |  |                  $("#printlist").html("");
 | 
	
		
			
				|  |  | +                 if(${machineIsPrint} == '1')
 | 
	
		
			
				|  |  | +                 {
 | 
	
		
			
				|  |  | +                     updatePrint(machineBarcode, false);
 | 
	
		
			
				|  |  | +                     $("#" + machineBarcode).remove();
 | 
	
		
			
				|  |  | +                 }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              /*获取产品信息*/
 |