Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-04 9891b042e48b186bbb850ab2ed445308bf5eec72

 src/main/webapp/views/pda/locNormalOut.html

@@ -12,6 +12,20 @@
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
</head>
<style>
    .form-box span {
        font-size: 16px;
        display: inline-block;
        text-align: right;
    }
    .form-box input {
        width: 165px;
        padding-left: 5px;
        height: 30px;
        border: 1px solid #777777;
        overflow:hidden;
        white-space:nowrap;
        text-overflow:ellipsis;
    }
    .number-tool {
        margin-left: 10px;
        padding: 1px 0 1px 5px;
@@ -88,18 +102,36 @@
</footer>

<!-- 修改数量弹窗 -->
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
    <div class="form-item">
        <span>编码</span>
        <input id="matnr2" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>名称</span>
        <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled"
                  readonly="readonly"></textarea>
<div id="modify" style="display: none; padding-top: 10px; text-align: center;">
    <div class="form-box">
        <div class="form-item">
            <table style="display: inline">
                <tr>
                    <td>
                        <span style="width: 35px; margin-right: 5px">编码</span>
                    </td>
                    <td style="text-align: left">
                        <input id="matnr2" type="text" disabled="disabled">
                    </td>
                </tr>
            </table>
        </div>
        <div class="form-item">
            <table style="display: inline">
                <tr>
                    <td style="vertical-align: top">
                        <span style="width: 35px; margin-right: 5px">名称</span>
                    </td>
                    <td style="text-align: left">
                    <textarea rows="3" style="resize: none; width: 165px" id="maktx2" type="text" disabled="disabled"
                              readonly="readonly"></textarea>
                    </td>
                </tr>
            </table>
        </div>
    </div>
    <input id="index" type="text" disabled="disabled" style="display: none;">
    <div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
    <div class="form-item" style="margin-top: 5px; margin-bottom: 8px;">
        <span style="vertical-align: middle">数量</span>
        <div class="number-tool" style="vertical-align: middle">
            <button onclick="reduce()">-</button>
@@ -179,7 +211,7 @@
                        offset: '20px',
                        title: '修改数量',
                        shadeClose: true,
                        area: ['80%', '200px'],
                        area: ['80%', '240px'],
                        content: $("#modify"),
                        success: function (layero, index) {
                            $('#matnr2').val(data.matnr);
@@ -215,7 +247,7 @@
                    $('#uuid').append(html);
                    layui.form.render('select');
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/";
                    top.location.href = baseUrl + "/pda";
                } else {
                    layer.msg(res.msg)
                }
@@ -231,6 +263,9 @@
    function findCode(el, type) {
        warehouseBar = $('#uuid').val();
        billNo = $("#billNo").val();
        if (billNo && billNo != '' && billNo.indexOf('=') > -1) {
            billNo = billNo.split(",")[0].split("=")[1];
        }
        switch (type) {
            case 'uuid':
//                exist('uuid', 'locArea');