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

luxiaotao1123

2020-06-27 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b

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

@@ -58,7 +58,7 @@
    <!-- 日期范围 -->
    <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">
            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
@@ -79,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>