机器统计页面

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

@@ -24,9 +24,9 @@
     </nav>
 		<div class="text-c" style="margin-top: 20px;">
 			<form action="${path}/admin/machine/_machine_list" method="post">
-				 	<input class="my-input" type="text" id="printNumber" name="printNumber" value="3" placeholder="打印数量"/>
-                	<input class="my-input" type="hidden" id="settingNumber" name="settingNumber" value="3"/>
-					<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>
+				 	<#--<input class="my-input" type="text" id="printNumber" name="printNumber" value="3" placeholder="打印数量"/>-->
+                	<input class="my-input" type="hidden" id="settingNumber" name="settingNumber" value="1"/>
+					<#--<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>-->
 
 					<input class="my-input" type="text" name="machineBarcode" value="${machineBarcode!''}" placeholder="请输入机器编号"/>
 					<select class="my-select" name="machineIsPrint">
@@ -77,7 +77,7 @@
 					<th width="100">机器二维码(点击打印)</th>
 					<th width="100">打印状态</th>
 					<th width="100">销售状态</th>
-					<th width="100">销售日期</th>
+					<#--<th width="100">销售日期</th>-->
 					<th width="100">生产流程状态</th>
 					<th width="50">生产时间</th>
                     <th width="40">硬件版本</th>
@@ -106,7 +106,7 @@
                                     未售出
 							</#if>
                             </td>
-							<td class="text-c" width="100">${(list.machineSalesDate?string("yyyy-MM-dd"))!''}</td>
+							<#--<td class="text-c" width="100">${(list.machineSalesDate?string("yyyy-MM-dd"))!''}</td>-->
                             <td class="text-c" width="100">
 							<#if list.machineProcessState == 1>
                                     正常
@@ -121,7 +121,8 @@
 							<!-- 遍历操作 -->
 							<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>
-							</td>
+                                <a onclick="print('${list.machineBarcode }','${list.machineQrcode }','${list.machineId }','${list.machineProduceType }')" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                            </td>
 						</tr>
 					</#list>
 				</tbody>
@@ -149,11 +150,11 @@
                 });
 
             }
-            function setting() {
+            /*function setting() {
                 var printNumber = $("#printNumber").val();
                 $("#settingNumber").val(printNumber);
                 alert("设置成功！");
-            }
+            }*/
 			function print(machineBarcode,machineQrcode,machineId,produceType){
                 var settingNumber = $("#settingNumber").val();
                 for (var i=0;i<settingNumber;i++){