From f4f3c04ba37cec6739370c4aa0b9622493de8a23 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/webapp/views/pickout/pickout.html | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 09c1aa3..6825de9 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -112,6 +112,8 @@
</div>
</div>
+<!-- 鎵撳嵃瀹瑰櫒 -->
+<div id="pakoutPrintBox" style="display: none"></div>
<!--<!– 鎼滅储鏍� –>-->
<!--<div id="search-box" class="layui-form layui-card-header">-->
<!-- <div class="layui-inline">-->
@@ -139,9 +141,7 @@
</script>
<script type="text/html" id="operate">
- {{#if (d.wrkSts == 3){ }}
- <a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
- {{# } }}
+
{{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">鎵撳嵃鎷ｈ揣鍗�</a>
{{# } }}
@@ -149,8 +149,11 @@
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
- {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
+ {{#if (d.wrkSts == 1){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鎾ら攢</a>
+ {{# } }}
+ {{#if (d.wrkSts == 2){ }}
+ <a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
{{# } }}
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
@@ -170,7 +173,9 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pickout/pickout.js" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -249,5 +254,48 @@
</div>
</form>
</script>
+
+
+<script type="text/template" id="pakoutPrintTpl">
+ <!-- 澶� -->
+ <div id="print-header" style="margin: 20px 0">
+ <div style="text-align: center">
+ <div style="text-align: center;margin-bottom: 10px">
+ <span style="font-family: 瀹嬩綋"> 鎷ｈ揣鍗� </span>
+ </div>
+
+ <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
+ <p style="letter-spacing: 2px;margin-top: 5px">{{data.pickout.wrkNo}}</p>
+ </div>
+ <div style="font-size: xx-small; text-align: left; margin-top: 10px">
+ <span style="font-family: 瀹嬩綋">瀹㈡埛锛歿{data.custName}}</span>
+ </div>
+ <div style="margin-top: 10px">
+ <div style="float: left;width: 50%; text-align: left">
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣鏁伴噺锛歿{data.total}}</span>
+ </div>
+ <div style="float: left; width: 50%; text-align: right">
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣浜猴細{{data.workerName}}</span>
+ </div>
+ <div style="clear:both;"></div>
+ </div>
+ </div>
+
+ <!-- 涓讳綋 -->
+ <div style="margin-top: 10px">
+ {{#each data.pickoutDetls}}
+ <div class="pakout-item" style="padding: 10px 5px 10px 5px;border-top: 1px solid #525252">
+ <div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-small">
+ {{maktx}}
+ </div>
+ <div class="item-content" style="margin: 10px 0 ">
+ <div style="float: left;font-family: 瀹嬩綋; font-size: xx-small">{{anfme}}{{unit}}</div>
+ <div style="float: right;font-family: 瀹嬩綋; font-size: xx-small">璐т綅锛歿{nodeName}}</div>
+ <div style="clear: both;"></div>
+ </div>
+ </div>
+ {{/each}}
+ </div>
+</script>
</html>
--
Gitblit v1.9.1