打印机页面修改

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

@@ -82,6 +82,7 @@
 
         <div class="input-box"><span class="input-dic spanhidth">拉线:</span><input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/> </div>
         <div class="input-box"><span class="input-dic spanhidth">机器数量:</span><input class="my-input" type="text" style="width: 76%;"  name="number" id="number" value="4" placeholder="每次最少生成一个机器"/> </div>
+        <div class="input-box">如果遇到批次，软件版本，BOM不清晰时，请联系POA（刘经理）</div>
 
         <div class="input-box">
             <span class="input-dic spanhidth"></span>

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

@@ -29,7 +29,7 @@
 					<#--<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>-->
                     <#-- <button type="button" class="my-btn-search" onclick="batch_add_machine('批量添加机器','${path}/admin/machine/_to_add_batch','','550');" style="cursor:pointer; margin-right: 50px;">添加机器</button>
                      &nbsp; &nbsp;-->
-                     <button type="button" class="my-btn-search" onclick="add_renovationmachine('批量添加机器','${path}/admin/machine/_to_add_renovation','570','450');" style="cursor:pointer; margin-right: 50px;">添加翻新机</button>
+                     <button type="button" class="my-btn-search" onclick="add_renovationmachine('批量添加机器','${path}/admin/machine/_to_add_renovation','570','450');" style="cursor:pointer; margin-right: 50px;">添加机器</button>
 
 					<input class="my-input" type="text" name="machineBarcode" value="${machineBarcode!''}" placeholder="请输入机器编号"/>
 					<select class="my-select" name="machineIsPrint">
@@ -76,6 +76,7 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort">
 				<thead>
 				<tr class="text-c">
+                    <th width="100">产品名/型号</th>
 					<th width="100">机器条码</th>
 					<th width="100">机器二维码</th>
 					<th width="100">打印状态</th>
@@ -86,7 +87,6 @@
                     <th width="40">硬件版本</th>
                     <th width="40">软件版本</th>
                     <th width="40">是否是翻新机</th>
-                    <th width="70">产品名/型号</th>
 					<th width="150">操作</th>
 				</tr>
 				</thead>
@@ -94,6 +94,9 @@
                 <#if page.dataList?? &&  (page.dataList?size > 0) >
 					<#list page.dataList as list>
 						<tr>
+                            <td class="text-c" width="140">
+                            ${list.produceName }/${list.producePattern }-${list.produceModel }
+                            </td>
 							<td class="text-c" width="100">${list.machineBarcode }</td>
 							<td class="text-c" width="100"><div id="${100000 + list_index}" onclick="print('${list.machineBarcode }','${list.machineQrcode }','${list.machineId }','${list.machineProduceType }')"><img style="width: 50px;height: 50px;" src="${list.machineQrcode }"></td>
                             <td class="text-c" width="100">
@@ -132,9 +135,6 @@
                                     否
                                 </#if>
                             </td>
-                            <td class="text-c" width="100">
-                                ${list.produceName }/${list.producePattern }-${list.produceModel }
-                            </td>
 							<!-- 遍历操作 -->
 							<td class="td-manage text-c">
                                 <a onclick="machineLogs(${list.machineId});" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>

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

@@ -275,7 +275,7 @@
                                             '<td class="text-c" width="10">'+machineName+'</td>' +
                                             '<td>'+machineCreateTime+'</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.machineId+');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a> </td></tr>');
+                                            '<a onclick="barCodePrint('+'\''+value.machineBarcode+'\''+','+'\''+value.machineId+'\''+',);" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a> </td></tr>');
 
 
                                 });
@@ -337,7 +337,6 @@
 
             //单个打印条形码
              function barCodePrint(barCode,machineId){
-                alert(barCode+"-"+machineId);
                  var  machineBarcode = barCode;
                  var machineQrcode = $("#machineQrcode"+machineId).val();
                  var machineProduceType = $("#machineProduceType"+machineId).val();