打印机页面修改

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

@@ -175,6 +175,7 @@
                 var produce = getProduce(machineId);
                 var producePattern =  produce.producePattern;    //获取产品型号前两位
                 var produceModel =  produce.produceModel;        //获取产品型号后两位
+                var produceName = produce.produceName;           //获取产品名称
                 
 
                 var settingNumber = $("#settingNumber").val();
@@ -186,7 +187,7 @@
                     $("#qrcodeImg").attr('src',machineQrcode);*/
                     if(produceType == 1){//净水机模板
                         $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">aiberle可移动智能净水机</span>' +
+                                '<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>' +
@@ -197,7 +198,7 @@
                     }
                     if(produceType == '' || produceType == null){
                         $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                                '<span style="position: absolute;left: 10px;font-size: 14px;">aiberle可移动智能净水机</span>' +
+                                '<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>' +
@@ -208,7 +209,7 @@
                     }
                     if(produceType == 2){//冲奶机模板
                         $("#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;">'+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>' +