修改系统报价功能。

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

@@ -213,6 +213,30 @@
                                         /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                         '</div>'
                                 );
+                            } else if(produceName == "熊小夕F10净饮机PLUS款 白色"){
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                        '<div style="width: 243px;height: 120px;position: relative;">' +
+                                        '<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>' +
+                                        /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                        '</div>'
+                                );
+                            } else if(produceName == "熊小夕F10净饮机PLUS款 天青色") {
+                                code128(machineBarcode);
+                                var barcodes2 = $("#bcTarget").html();
+                                $("#printlist").append(
+                                        '<div style="width: 243px;height: 120px;position: relative;">' +
+                                        '<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>' +
+                                        /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                        '</div>'
+                                );
                             } else {
                                 code128(machineBarcode);
                                 var barcodes2 = $("#bcTarget").html();
@@ -486,15 +510,41 @@
             $("#qrcodeImg").attr('src',machineQrcode);*/
             if (isPrintQrcode == 2) {
                 if(berGenerateRules === 3){
-                    code128(machineBarcode);
-                    var barcodes2 = $("#bcTarget").html();
-                    $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                            '<span style="padding-left: 10px;">反渗透净水机</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>' +
-                            /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
-                            '</div>');
+                    if(produceName == "熊小夕F10净饮机PLUS款 白色"){
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append(
+                                '<div style="width: 243px;height: 120px;position: relative;">' +
+                                '<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>' +
+                                /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                '</div>'
+                        );
+                    } else if(produceName == "熊小夕F10净饮机PLUS款 天青色") {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append(
+                                '<div style="width: 243px;height: 120px;position: relative;">' +
+                                '<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>' +
+                                /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                '</div>'
+                        );
+                    } else {
+                        code128(machineBarcode);
+                        var barcodes2 = $("#bcTarget").html();
+                        $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                '<span style="padding-left: 10px;">反渗透净水机</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>' +
+                                /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                        '</div>');
+                    }
                     // $("#printlist").append();
                 }else if(berGenerateRules === 4){
                     code128(machineBarcode);