Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

wang..123

2022-03-25 f4f3c04ba37cec6739370c4aa0b9622493de8a23

 src/main/webapp/views/pickout/pickout.html

@@ -112,6 +112,8 @@
    </div>
</div>

<!-- 打印容器 -->
<div id="pakoutPrintBox" style="display: none"></div>
<!--&lt;!&ndash; 搜索栏 &ndash;&gt;-->
<!--<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>