Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

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

@@ -26,11 +26,9 @@
            font-size: 16px;
            display: inline-block;
            text-align: right;
            width: 70px;
        }
        .form-box input {
            width: 120px;
            margin-left: 10px;
            width: 160px;
            padding-left: 5px;
            height: 30px;
            border: 1px solid #777777;
@@ -77,21 +75,57 @@

<div class="form-box">
    <div class="form-item">
        <span>物料编码</span>
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">编码</span>
                </td>
                <td style="text-align: left">
                    <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
        <span>物料名称</span>
        <input id="matName" type="text" disabled="disabled">
        <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="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
        <span>物料规格</span>
        <input id="str2" type="text" disabled="disabled">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">规格</span>
                </td>
                <td style="text-align: left">
                    <input id="str2" type="text" disabled="disabled">
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
        <span>单位</span>
        <input id="str1" type="text" disabled="disabled">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">单号</span>
                </td>
                <td style="text-align: left">
                    <input id="mnemonic" type="text" autocomplete="off">
                </td>
            </tr>
        </table>
    </div>
    <!--<div class="form-item">-->
        <!--<span>单位</span>-->
        <!--<input id="str1" type="text" disabled="disabled">-->
    <!--</div>-->
    <div class="form-item">
        <span style="vertical-align: middle">数量</span>
        <div class="number-tool" style="vertical-align: middle">
@@ -146,7 +180,8 @@
        var data = {
            matNo: $('#matNo').val(),
            matName: $('#matName').val(),
            count: countDom.val()
            count: countDom.val(),
            mnemonic: $("#mnemonic").val()
        };
        parent.addTableData(data);
        parent.layer.close(parent.matCodeLayerIdx);