Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-06-27 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b

 src/main/webapp/views/matCode/matCode.html

@@ -10,6 +10,19 @@
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
        #search-box {
            padding: 30px 30px 10px 30px;
        }
        #search-box .layui-inline {
            margin-right: 5px;
        }
        #data-search-btn {
            margin-top: 10px;
        }
        #data-search-btn.layui-btn-container .layui-btn {
            margin-right: 20px;
        }

        .btn-print {
            display: none;
        }
@@ -38,12 +51,21 @@
<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <label class="layui-form-label">物料编码：</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="mat_no" placeholder="请输入" autocomplete="off">
            <input class="layui-input" type="text" name="mat_no" placeholder="物料编码" autocomplete="off">
        </div>
    </div>

    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
@@ -57,16 +79,15 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
        <button class="layui-btn " id="btn-into" lay-event="intoData">导入</button>
        <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
        <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">导入</button>
        <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -203,10 +224,7 @@
                        <tr>
                            <td align="center" width="50%" rowspan="1" colspan="3">物料规格</td>
                            <td align="center" width="50%" colspan="3" rowspan="4">
                                <img class="template-code template-qrcode" src="" width="80%">
                                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                                    <span>xxxxxx</span>
                                </div>
                                <img class="template-code template-qrcode" src="">
                            </td>
                        </tr>
                        <tr>
@@ -311,10 +329,7 @@
        <tr>
            <td align="center" width="50%" rowspan="1" colspan="3">物料单位</td>
            <td align="center" width="50%" colspan="3" rowspan="4">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                    <span>{{this.matNo}}</span>
                </div>
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}">
            </td>
        </tr>
        <tr>