修改：杰牌净水机打印设置

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

@@ -231,7 +231,6 @@
                                     '</div>');
                         } else if(produceName === "西班牙Bermax") {
                             // 西班牙
-
                             $("#printlist").append('<div style="width: 242px;height: 122px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">Bermax</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
@@ -242,15 +241,27 @@
                                     '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ produceCreateTime +'</span>' +
                                     '</div>');
                         }else{
-                            $("#printlist").append('<div style="width: 242px;height: 122px;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>');
+                            if (produceName === "杰牌WB-1净水机") {
+                                $("#printlist").append('<div style="width: 242px;height: 124px;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: 122px;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{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
@@ -274,7 +285,7 @@
                                         '<img style="position: absolute;right: 5px;top:13px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                                         '<span style="position: absolute;right: 0px;top: 87px;font-size: 8px;display: none;"><b>淘宝/天猫APP 滤芯购买</b></span>' +
                                         '</div>');*/
-                            }else{
+                            } else{
                                 $("#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;"></span>' +
@@ -286,15 +297,16 @@
                                         '</div>');
                             }
                         }else{
-                                $("#printlist").append('<div style="width: 242px;height: 122px;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>');
+
+                            $("#printlist").append('<div style="width: 242px;height: 122px;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>');
                         }
                      }
                 }