Просмотр исходного кода

修改熊小夕海外版机器。

hexiugang 3 лет назад
Родитель
Сommit
2ff1509da0

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

@@ -322,12 +322,12 @@
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>'
                                 );
-                            } else if(produceName == "即热台式净饮机 PLUS版") {
+                            } else if(produceName == "熊小夕F118净饮机 PLUS版") {
                                 code128(machineBarcode);
                                 var barcodes2 = $("#bcTarget").html();
                                 $("#printlist").append(
                                     '<div style="width: 243px;height: 120px;position: relative;">' +
-                                    '<span style="padding-left: 10px;">即热台式净饮机 矿泉版</span>' +
+                                    '<span style="padding-left: 10px;">即热台式净饮机 PLUS版 </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;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
@@ -754,12 +754,12 @@
                             /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>'
                         );
-                    } else if(produceName == "即热台式净饮机 PLUS版") {
+                    } else if(produceName == "熊小夕F118净饮机 PLUS版") {
                         code128(machineBarcode);
                         var barcodes2 = $("#bcTarget").html();
                         $("#printlist").append(
                             '<div style="width: 243px;height: 120px;position: relative;">' +
-                            '<span style="padding-left: 10px;">即热台式净饮机 矿泉版</span>' +
+                            '<span style="padding-left: 10px;">即热台式净饮机 PLUS版 </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;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +