打印模板调整

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

@@ -176,36 +176,36 @@
                     /*$("#barcodeId").html(machineBarcode);
                     $("#qrcodeImg").attr('src',machineQrcode);*/
                     if(produceType == 1){//净水机模板
-                        $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
-                                '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">NO.'+ machineNo +'</span> ' +
+                        $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                '<span style="position: absolute;top:-1px;font-size: 14px;">WaterO可移动智能净水机</span>' +
+                                '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
                     if(produceType == '' || produceType == null){
-                        $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
-                                '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">NO.'+ machineNo +'</span> ' +
+                        $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                '<span style="position: absolute;top:-1px;font-size: 14px;">WaterO可移动智能净水机</span>' +
+                                '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
                     if(produceType == 2){//冲奶机模板
-                        $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                '<span style="position: absolute;top:0px;font-size: 14px;">爱贝源冲奶机</span>' +
-                                '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">NO.'+ machineNo +'</span> ' +
+                        $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                '<span style="position: absolute;top:-1px;font-size: 14px;">爱贝源冲奶机</span>' +
+                                '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
 

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

@@ -166,25 +166,25 @@
                         /*$("#barcodeId").html(machineBarcode);
                         $("#qrcodeImg").attr('src',machineQrcode);*/
                         if (machineProduceType == 1) {//净水机模板
-                            $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                    '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
-                                    '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                    '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;"  class="barcodeImg">' + barcodes + '</div>' +
-                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;">' + machineBarcode + '</span>' +
-                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;"  src="' + machineQrcode + '" /> ' +
-                                    '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">'+ machineNo +'</span> ' +
+                            $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                    '<span style="position: absolute;top:-1px;font-size: 14px;">WaterO可移动智能净水机</span>' +
+                                    '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                    '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                    '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                    '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                    '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                    '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                     '</div>');
                         }
                         if (machineProduceType == 2) {//冲奶机模板
-                            $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                    '<span style="position: absolute;top:0px;font-size: 14px;">爱贝源冲奶机</span>' +
-                                    '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                    '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;"  class="barcodeImg">' + barcodes + '</div>' +
-                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" >' + machineBarcode + '</span>' +
-                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;"  src="' + machineQrcode + '" /> ' +
-                                    '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">'+ machineNo +'</span> ' +
+                            $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                    '<span style="position: absolute;top:-1px;font-size: 14px;">爱贝源冲奶机</span>' +
+                                    '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                    '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                    '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                    '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                    '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                    '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                     '</div>');
                         }
                         /*updatePrint(machineBarcode);*/
@@ -321,25 +321,25 @@
                             '</div>');*/
 
                     if(machineProduceType == 1){//净水机模板
-                        $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
-                                '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">'+ machineNo +'</span>' +
+                        $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                '<span style="position: absolute;top:-1px;font-size: 14px;">WaterO可移动智能净水机</span>' +
+                                '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
                     if(machineProduceType == 2){//冲奶机模板
-                        $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
-                                '<span style="position: absolute;top:0px;font-size: 14px;">爱贝源冲奶机</span>' +
-                                '<span style="position: absolute;top: 24px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                                '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
-                                '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
-                                '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
-                                '<span style="position: absolute;right: 9px;top: 102px;font-size: 12px;">'+ machineNo +'</span> ' +
+                        $("#printlist").append('<div style="width: 268px;height: 162px;position: relative;">' +
+                                '<span style="position: absolute;top:-1px;font-size: 14px;">爱贝源冲奶机</span>' +
+                                '<span style="position: absolute;top: 23px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                '<span style="position: absolute;top: 39px;font-size: 12px;">S／N</span>' +
+                                '<div style="position: absolute;left: -10px;top: 74px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<span style="position: absolute;top: 101px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                                '<img style="position: absolute;right: 2px;top:17px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                                '<span style="position: absolute;right: 9px;top: 101px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
                 }