自动化立体仓库 - WMS系统
18516761980
2022-06-17 78ec243f7fc510299200bcc82fcd16775da08a3c
Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
# src/main/java/com/zy/asrs/controller/MatCodeController.java
# src/main/java/com/zy/asrs/utils/VersionUtils.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
# src/main/resources/application.yml
2个文件已修改
13 ■■■■ 已修改文件
src/main/webapp/views/pda/login.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/waitPakin/waitPakin.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/login.html
@@ -78,7 +78,7 @@
    </header>
    <div class="layui-form layadmin-user-login-body">
        <div class="layui-form-item">
            <input id="mobile" class="layui-input" type="text" name="mobile" lay-verify="mobile" placeholder="账号" autocomplete="off">
            <input id="username" class="layui-input" type="text" name="username" lay-verify="username" placeholder="账号" autocomplete="off">
        </div>
        <div class="layui-form-item">
            <input id="password" class="layui-input" type="password" name="password" lay-verify="password" placeholder="密码" autocomplete="off">
@@ -103,10 +103,10 @@
            $ = layui.jquery;
        form.on('submit(login)', function (data) {
            var mobile = $("#mobile").val();
            if (mobile === "") {
            var username = $("#username").val();
            if (username === "") {
                layer.msg("请输入账号", {icon: 2})
                $("#mobile").focus();
                $("#username").focus();
                return;
            }
            var password = $("#password").val();
@@ -117,9 +117,10 @@
            }
            var user = {
                mobile: mobile,
                username: username,
                password: hex_md5(password)
            };
            debugger
            $.ajax({
                url: baseUrl+"/login.action",
                data: user,
src/main/webapp/views/waitPakin/waitPakin.html
@@ -43,7 +43,7 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">生成任务</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">生成任务</button>-->
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="">导出</button>