打印列表修改

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

@@ -45,8 +45,9 @@
                     <thead>
                     <tr class="text-c">
                         <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
+                        <th width="10">设备尾号</th>
                         <th width="10">产品条码</th>
-                        <th width="10">机器类型</th>
+                        <th width="6">机器类型</th>
                         <th width="20">操作</th>
                     </tr>
                     </thead>
@@ -62,8 +63,9 @@
                                     <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
                                     <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
                                 </td>
+                                <td class="text-c" style="font-size: 17px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
                                 <td class="text-c" width="10">${list.machineBarcode }</td>
-                                <td class="text-c" width="10">
+                                <td class="text-c" width="6">
                                     <#if list.machineProduceType == 1>
                                         净水机
                                     </#if>
@@ -206,8 +208,7 @@
             },2000);
             function  latestMachine() {
                 var machineIsPrint = $("#machineIsPrint").val();
-
-                if(machineIsPrint == 2){
+                if(machineIsPrint == 1){
                     $.ajax({
                         cache: true,
                         type: "POST",
@@ -226,12 +227,14 @@
                                     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: 17px" width="10">'+private+'</td>' +
                                             '<td class="text-c" width="10">'+value.machineBarcode+'</td>' +
                                             '<td class="text-c" width="10">'+machineType+'</td>' +
-                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe647;</i></a>' +
+                                            '<td class="td-manage text-c"> <a onclick="updatePrint('+value.machineBarcode+');" 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>');