pts打印修改

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -180,28 +180,27 @@
                 var barcodes = $("#bcTarget").html();
                 /*$("#barcodeId").html(machineBarcode);
                 $("#qrcodeImg").attr('src',machineQrcode);*/
-                /* if (machineProduceType == 1) {//净水机模板*/
+                if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                         '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                         '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                         '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                         '</div>');
-                /*}*/
-                /*if (machineProduceType == 2) {//冲奶机模板
+                }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
-                            '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                            '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                            '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                            '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
-                            '</div>');
-                }*/
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                        '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
+                        '</div>');
+                }
                 if(${machineIsPrint} == '1')
                 {
                     updatePrint(machineBarcode,false);
@@ -355,28 +354,27 @@
             code128(machineBarcode);
             var barcodes = $("#bcTarget").html();
 
-            /*if(machineProduceType == 1){//净水机模板*/
-            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                    '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
-                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                    '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                    '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                    '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                    '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
-                    '</div>');
-            /*}*/
-            /*if(machineProduceType == 2){//冲奶机模板
+            if (produceName.indexOf("富氢") != -1 || produceName.indexOf("诺米克") != -1) {
+                $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                        '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                        '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
+                        '</div>');
+            }else{
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
+                        '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                         '</div>');
-            }*/
+            }
 
         }
         if(settingNumber > 24){