打印机页面修改

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

@@ -290,6 +290,7 @@
                                 if(value.machineIsRetreading == 2){
                                     machineIsRetreading =  "否";
                                 }
+                                var machineName = value.produceName+"/"+value.producePattern+"-"+value.produceModel;
 								$("#listid").prepend('<tr>'
                                         +'<td class="text-c" width="100">'+value.machineBarcode+'</td>'
                                         +'<td class="text-c" width="100"><div id="" onclick="print('+'\''+value.machineBarcode+'\''+','+'\''+value.machineQrcode+'\''+','+'\''+value.machineId+'\''+','+'\''+value.machineProduceType+'\''+')"><img style="width: 50px;height: 50px;" src="'+value.machineQrcode+'"></td>'
@@ -301,6 +302,7 @@
                                         +'<td class="text-c" width="50">'+value.machineHardwareVersionName+'</td>'
                                         +'<td class="text-c" width="50">'+value.machineSoftwareVersionName+'</td>'
                                         +'<td class="text-c" width="50">'+machineIsRetreading+'</td>'
+                                        +'<td class="text-c" width="50">'+machineName+'</td>'
                             			+'<td class="td-manage text-c">'
                                         +'<a onclick="machineLogs('+value.machineId+');" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>'
                                         +'<a onclick="print('+'\''+value.machineBarcode+'\''+','+'\''+value.machineQrcode+'\''+','+'\''+value.machineId+'\''+','+'\''+value.machineProduceType+'\''+')" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>'

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

@@ -255,20 +255,21 @@
                                     if(i+1 == data.length){
                                         $("#machineId").val(value.machineId);
                                     }
-                                    var machineType = "";
+                                    var machineName = value.produceName+"/"+value.producePattern+"-"+value.produceModel;
+                                    /*var machineType = "";
                                     if(value.machineProduceType == 1){
                                         machineType = "净水机";
                                     }
                                     if(value.machineProduceType == 2){
                                         machineType = "冲奶机";
-                                    }
+                                    }*/
                                     var private = value.machineBarcode.substr(value.machineBarcode.length-4);
                                     $("#listid").prepend('<tr class="text-c"><td width="2"> ' +
                                             '<input name="checkbox" type="checkbox" value="'+value.machineBarcode+value.machineQrcode+value.machineProduceType+'"  machineId="'+value.machineId+'"> ' +
                                             '<input type="hidden" value="'+value.machineId + 1000000 +'" id="'+value.machineBarcode + 'Id'+'"></td>' +
                                     '<td class="text-c" style="font-size: 24px" width="10">'+private+'</td>' +
                                             '<td class="text-c" width="10">'+value.machineBarcode+'</td>' +
-                                            '<td class="text-c" width="10">'+machineType+'</td>' +
+                                            '<td class="text-c" width="10">'+machineName+'</td>' +
                                             '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>' +
                                             '<a onclick="barCodePrint('+value.machineBarcode+value.machineQrcode+value.machineProduceType+','+value.machineId+');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a> </td></tr>');