#
luxiaotao1123
2020-06-29 b9a39835ef2d4826d621a7585569ccc9df8af4a3
#
1个文件已添加
3个文件已修改
378 ■■■■ 已修改文件
src/main/webapp/static/css/pda.css 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/comb.html 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockIn.html 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/css/pda.css
New file
@@ -0,0 +1,86 @@
* {
    font-family: microsoft yahei,serif;
    margin: 0;
    padding: 0;
    box-sizing: border-box;
    -webkit-box-sizing: border-box;
    -moz-box-sizing: border-box;
    font-size: 11px;
}
html {
    height: 100%;
    background-color: #f1f1f1;
    padding: 5px;
}
body {
    height: 100%;
    background-color: #fff;
    border-radius: 5px;
    box-shadow: 0 0 3px rgba(0,0,0,.3);
    padding: 5px;
    position: relative;
}
/* 头部 */
header {
    padding: 5px 0;
}
.layui-form-label {
    width: initial;
    padding: 6px 10px;
}
#code {
    width: 75%;
    height: 30px;
    margin-right: 0;
}
header button {
    height: 20px;
    width: 70px;
}
/* layer */
.layui-layer-title {
    font-size: 11px;
    height: 20px;
    line-height: 20px;
}
/* 主体 */
main {
    height: 170px;
    overflow: auto;
}
.layui-table, .layui-table-view {
    margin: 0;
}
.layui-table-view .layui-table td, .layui-table-view .layui-table th {
    padding: 0;
}
.layui-table-cell {
    height: 22px;
    line-height: 22px;
    padding: 0;
}
.layui-table-grid-down {
    display: none;
}
.layui-table-body .layui-none {
    /*height: 144px;*/
}
/* 尾部 */
footer {
    position: absolute;
    bottom: 5px;
}
.layui-btn-container .layui-btn {
    margin-left: 10px;
    margin-bottom: 2px;
}
#tips {
    display: inline-block;
    color: #666;
    margin-left: 5px;
    margin-bottom: 5px;
    vertical-align: middle;
}
src/main/webapp/views/pda/comb.html
@@ -5,99 +5,14 @@
    <meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
    <title>组托</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/pda.css" media="all">
    <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/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <style>
        * {
            font-family: microsoft yahei,serif;
            margin: 0;
            padding: 0;
            box-sizing: border-box;
            -webkit-box-sizing: border-box;
            -moz-box-sizing: border-box;
            font-size: 11px;
        }
        html {
            height: 100%;
            background-color: #f1f1f1;
            padding: 5px;
        }
        body {
            height: 100%;
            background-color: #fff;
            border-radius: 5px;
            box-shadow: 0 0 3px rgba(0,0,0,.3);
            padding: 5px;
            position: relative;
        }
        /* 头部 */
        header {
            padding: 5px 0;
        }
        .layui-form-label {
            width: initial;
            padding: 6px 10px;
        }
        #code {
            width: 75%;
            height: 30px;
            margin-right: 0;
        }
        header button {
            height: 20px;
            width: 70px;
        }
        /* layer */
        .layui-layer-title {
            font-size: 11px;
            height: 20px;
            line-height: 20px;
        }
        /* 主体 */
        main {
            height: 170px;
            overflow: auto;
        }
        .layui-table, .layui-table-view {
            margin: 0;
        }
        .layui-table-view .layui-table td, .layui-table-view .layui-table th {
            padding: 0;
        }
        .layui-table-cell {
            height: 22px;
            line-height: 22px;
            padding: 0;
        }
        .layui-table-grid-down {
            display: none;
        }
        .layui-table-body .layui-none {
            /*height: 144px;*/
        }
        /* 尾部 */
        footer {
            position: absolute;
            bottom: 5px;
            text-align: center;
        }
        .layui-btn-container .layui-btn {
            margin-left: 10px;
            margin-bottom: 2px;
        }
        #tips {
            display: inline-block;
            color: #666;
            margin-left: 5px;
            margin-bottom: 5px;
            vertical-align: middle;
        }
    </style>
</head>
<body>
src/main/webapp/views/pda/index.html
@@ -78,7 +78,7 @@
</ul>
<!-- 主体内容 -->
<iframe id="content" src="comb.html"></iframe>
<iframe id="content" src="stockIn.html"></iframe>
</body>
<script>
src/main/webapp/views/pda/stockIn.html
@@ -5,13 +5,216 @@
    <meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
    <title>入库</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/pda.css" media="all">
    <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/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <style>
        main {
            height: 145px;
        }
        .site-list {
            padding: 2px 0;
            height: 22px;
            margin-bottom: 5px;
        }
        .site-list label {
            padding: 0 0 0 15px;
        }
        .site-list span {
            vertical-align: middle;
            font-size: 13px;
        }
        .cool-checkbox:checked {
            background:#1673ff
        }
        .cool-checkbox {
            width:15px;
            height:15px;
            background-color:#ffffff;
            border:solid 1px #dddddd;
            -webkit-border-radius:50%;
            border-radius:50%;
            font-size:15px;
            margin:0 5px 0 0;
            padding:0;
            position:relative;
            display:inline-block;
            vertical-align:middle;
            cursor:default;
            -webkit-appearance:none;
            -webkit-user-select:none;
            user-select:none;
            -webkit-transition:background-color ease 0.1s;
            transition:background-color ease 0.1s;
        }
        .cool-checkbox:checked::after {
            content:'';
            top:3px;
            left:3px;
            position:absolute;
            background:transparent;
            border:#fff solid 2px;
            border-top:none;
            border-right:none;
            height:3px;
            width:6px;
            -moz-transform:rotate(-45deg);
            -ms-transform:rotate(-45deg);
            -webkit-transform:rotate(-45deg);
            transform:rotate(-45deg);
        }
    </style>
</head>
<body>
<!-- 头部 -->
<header>
    <div class="layui-input-inline">
        <label class="layui-form-label">条码</label>
        <input class="layui-input" type="text" id="code" placeholder="扫码 / 输入" autocomplete="off">
    </div>
    <div style="margin: 5px 5px">
        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
    </div>
</header>
<!-- 主体 -->
<main>
    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
</main>
<!-- 尾部 -->
<footer>
    <!-- 入库口 -->
    <div class="site-list">
        <label><input class="cool-checkbox" type="radio" name="site"><span>1</span></label>
        <label><input class="cool-checkbox" type="radio" name="site"><span>2</span></label>
        <label><input class="cool-checkbox" type="radio" name="site"><span>3</span></label>
    </div>
    <div class="layui-btn-container">
        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">重置</button>
        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="pakIn()" style="margin-left: 20px">入库</button>
        <span id="tips"></span>
    </div>
</footer>
</body>
<script>
    var tableIns;
    layui.use(['table','laydate', 'form'], function() {
        var table = layui.table;
        var $ = layui.jquery;
        var layer = layui.layer;
        var form = layui.form;
        tableIns = table.render({
            elem: '#chooseData',
            data: [],
            limit: 500,
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '量', style:'color: blue', width:20},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
            ]],
            done: function (res, curr, count) {
            }
        });
    });
    window.onload = function(){document.getElementById("code").focus();}
    var matCodeLayerIdx;
    function getMat() {
        matCodeLayerIdx = layer.open({
            type: 2,
            title: '物料',
            shade: [0.3,'#000'],
            area: ['90%', '90%'],
            content: 'matQuery.html',
            success: function(layero, index){
                $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
                $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
            }
        });
    }
    // 添加表格数据
    var matData = [];
    function addTableData(data) {
        if (isEmpty(data.matName)){
            tips("提取失败");
            return;
        }
        let toPush = true;
        for (var j=0;j<matData.length;j++){
            if (data.matNo === matData[j].matNo) {
                matData[j].count = Number(matData[j].count) + Number(data.count);
                toPush  = false;
            }
        }
        if (toPush) {
            matData.push(data);
        }
        tips("提取成功");
        tableIns.reload({data: matData});
    }
    // 重置
    function reset() {
        $('#code').val("");
        matData = [];
        tableIns.reload({data: matData});
        tips("");
    }
    // 入库
    function pakIn() {
        let barcode = $('#code').val();
        if (isEmpty(barcode)) {
            tips("托盘条码为空", true);
            document.getElementById("code").focus();
            return;
        }
        if (matData.length === 0) {
            tips("请提取物料", true);
            return;
        }
        $.ajax({
            url: baseUrl+"/mobile/comb/auth",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,
                combMats: matData
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("组托成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true)
                }
            }
        })
    }
    /**
     * 提示信息
     * @param msg 提示内容
     * @param warn true:红色字体
     */
    function tips(msg, warn) {
        let tips = $('#tips');
        tips.html(msg);
        tips.css("color", warn?"red":'#666');
    }
</script>
</html>