Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -59,34 +59,34 @@
                             <#assign machineList = page.dataList />
                         </#if>
                         <#if machineList?? &&  (machineList?size > 0) >
-                            <#list machineList as list>
-                                <tr class="text-c" id="${list.machineBarcode }">
-                                    <td width="2">
-                                        <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: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
-                                    <td class="text-c" width="10">${list.machineBarcode }</td>
-                                    <td class="text-c" width="6">
-                                        <#if list.machineProduceType == 1>
-                                            净水机
-                                        </#if>
-                                        <#if list.machineProduceType == 2>
-                                            冲奶机
-                                        </#if>
-                                    </td>
-                                    <td>${(list.machineCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
-                                    <!-- 遍历操作 -->
-                                    <td class="td-manage text-c">
-                                        <#if machineIsPrint == '1'>
-                                        <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
-                                        </#if>
-                                        <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
-                                    </td>
-                                </tr>
-                            </#list>
+                        <#list machineList as list>
+                            <tr class="text-c" id="${list.machineBarcode }">
+                                <td width="2">
+                                    <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: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
+                                <td class="text-c" width="10">${list.machineBarcode }</td>
+                                <td class="text-c" width="6">
+                                    <#if list.machineProduceType == 1>
+                                        净水机
+                                    </#if>
+                                    <#if list.machineProduceType == 2>
+                                        冲奶机
+                                    </#if>
+                                </td>
+                                <td>${(list.machineCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                                <!-- 遍历操作 -->
+                                <td class="td-manage text-c">
+                                    <#if machineIsPrint == '1'>
+                                        <a onclick="updatePrint('${list.machineBarcode}',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
+                                    </#if>
+                                    <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                                </td>
+                            </tr>
+                        </#list>
                         <#else>
-                            <tr><td colspan="5" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                        <tr><td colspan="5" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
                         </#if>
                     </tbody>
                 </table>
@@ -197,7 +197,11 @@
                                     '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
                                     '</div>');
                         }
-                        /*updatePrint(machineBarcode);*/
+                        if(${machineIsPrint} == '1')
+                        {
+                            updatePrint(machineBarcode,false);
+                            $("#" + machineBarcode).remove();
+                        }
                     }
                 });
                 numbers = numbers - parseInt(settingNumber);
@@ -261,7 +265,7 @@
                                     '<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="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>' +
+                                            '<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>');
 
 
@@ -278,7 +282,7 @@
             }
 
 
-                function updatePrint(machineBarcode){
+                function updatePrint(machineBarcode,type){
                     $.ajax({
                         "type" : "post",
                         "url" : "${path}/admin/machine/_update_print",
@@ -286,7 +290,9 @@
                         "data" :{machineBarcode : machineBarcode},
                         "success" : function(data) {
                             $("#"+machineBarcode).remove();
-                            layer.msg('修改成功', {icon: 1, time: 2000});
+                            if(type){
+                                layer.msg('修改成功', {icon: 1, time: 2000});
+                            }
                         },
                         "error":function(data){
                             layer.msg('操作失败', {icon: 2, time: 2000});
@@ -311,6 +317,7 @@
                     /*"data" :{machineBarcodes : JSON.stringify(a)},*/
                     "success" : function(data) {
                         layer.msg('修改成功!', {icon: 1,time:2000});
+                        location.replace(location.href);
                     },
                     "error":function(data){
                         /*alert("操作失败，请联系管理员！");*/
@@ -372,9 +379,15 @@
                                 '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;">'+ machineNo +'</span>' +
                                 '</div>');
                     }
+
                 }
                 $("#printlist").printArea();
                 $("#printlist").html("");
+                 if(${machineIsPrint} == '1')
+                 {
+                     updatePrint(machineBarcode, false);
+                     $("#" + machineBarcode).remove();
+                 }
             }
 
             /*获取产品信息*/