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

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

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

@@ -85,11 +85,11 @@
    </div>
    <div class="form-item">
        <span>产品代号</span>
        <input id="matNo" type="text" disabled="disabled">
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>产品名称</span>
        <input id="matName" type="text" disabled="disabled">
        <input id="maktx" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span style="vertical-align: middle">数量</span>
@@ -133,8 +133,8 @@
        }
        parent.updateTableData({
            locNo: $('#locNo').val(),
            matNo: $('#matNo').val(),
            matName: $('#matName').val(),
            matnr: $('#matnr').val(),
            maktx: $('#maktx').val(),
            count: countDom.val()
        })
        parent.layer.closeAll();
@@ -143,7 +143,7 @@
    function remove() {
        parent.removeTableData({
            locNo: $('#locNo').val(),
            matNo: $('#matNo').val(),
            matnr: $('#matnr').val(),
        })
        parent.layer.closeAll();
    }