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

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -21,6 +21,7 @@
 <div class="page-container">
 <div class="text-c">
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
+        <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="add_device();">添加设备</button>
         <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
         <select class="select" name="deviceStatus" style="height: 30px;width: 150px">
             <option value ="">全部</option>
@@ -32,11 +33,7 @@
         <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
     </form>
 </div>
-<div class="cl pd-5 bk-gray mt-20">
-        <span class="l">
-            <button onClick="add_device();" class="btn radius" style="background: #58d2ea;color: #fff;" type="button"><i class="Hui-iconfont">&#xe604;</i>添加设备</button>
-        </span>
-</div>
+<div class="mt-20">
     <table class="table table-border table-bordered table-bg table-hover table-sort">
         <thead>
         <tr class="text-c">
@@ -94,6 +91,7 @@
         </#list>
         </tbody>
     </table>
+    </div>
 </div>
 <div style="padding-top: 10px;"></div>
 <#include "/base/page_util.ftl">

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

@@ -28,6 +28,7 @@
                         </div>
                     </div>
                 <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint"/>
+                    <span class="text-c">每个二维码打印数量</span>
                 <input class="my-input" type="text" id="settingNumber" name="printNumber" value="3" placeholder="打印数量" style="margin-top: 10px;"/>
                 <button type="button" class="my-btn-search" onclick="printList();" style="margin-right: 50px;margin-top: 10px;">打印</button>
                     <button type="button" class="my-btn-search" onclick="batchUpdatePring();" style="margin-right: 50px;margin-top: 10px;">修改为已打印</button>
@@ -118,9 +119,9 @@
                 var prints = "";
                 var settingNumber = $("#settingNumber").val();
                 var msg = "每个条形码打印数量为"+settingNumber+"条！";
-                layer.confirm(msg, {
+                /*layer.confirm(msg, {
                     btn: ['确认','取消'] //按钮
-                }, function(){
+                }, function(){*/
                     $("input[name='checkbox']:checkbox:checked").each(function(){
                         prints += $(this).val();
                         machineBarcode = $(this).val().substring(0,13);
@@ -163,9 +164,9 @@
                     }else{
                         layer.msg('未选中需要打印的条形码', {icon: 2,time:2000});
                     }
-                }, function(){
+               /* }, function(){
                     return;
-                });
+                });*/
 
                 /*if (confirm(msg)==true){