From 93c387d8d0a14be06a134c77cc2e48d5d32c95bf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 01 七月 2024 16:26:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 91123ac..3a3bd46 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -39,6 +39,7 @@
</div>
</div>
<button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+ <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
<div class="layui-inline" style="width: 200px;">
<div class="layui-input-block">
<select name="PrintName" lay-verify="required" id="PrintName">
@@ -1028,7 +1029,7 @@
});
//鎵撳嵃鎸夐挳
- form.on('submit(Print)', function (data) {//閫�鍑�
+ form.on('submit(Print2)', function (data) {//閫�鍑�
//鎵撳紑鎵撳嵃妯℃澘
var linterid = $("#HInterID").val();
//var linterid = "28973";
@@ -1089,6 +1090,17 @@
})
});
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print)', function (data) {//閫�鍑�
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HInterID").val();
+ var Type = "HBarCodePrint";
+ var OpenTmp = "鐧芥爣鎵撳嵃1";
+ //var ReportViewer = document.getElementById("ReportViewer");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ $("#Print2").click();
+ });
+
//鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
--
Gitblit v1.9.1