Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs

L

2025-07-11 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb

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

@@ -77,15 +77,15 @@

<div class="form-box">
    <div class="form-item">
        <span>物料编码</span>
        <span>规格</span>
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
    </div>
    <div class="form-item">
        <span>物料名称</span>
        <span>商品名称</span>
        <input id="matName" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>物料规格</span>
        <span>接头</span>
        <input id="str2" type="text" disabled="disabled">
    </div>
    <div class="form-item">
@@ -108,17 +108,17 @@
    var pageCurr;

    /**
     * 根据物料编码查询物料详情
     * 根据商品编号查询物料详情
     */
    function find(el){
        if (isEmpty(el.value)) {
            return;
        }
        $.ajax({
            url: baseUrl + "/matCode/auth",
            url: baseUrl + "/mat/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                id: el.value
                matnr: el.value
            },
            method: 'POST',
            success: function (res) {
@@ -128,7 +128,7 @@
                        $('#str1').val(res.data.str1);
                        $('#str2').val(res.data.str2);
                        countDom.val(initMatCount);
                        $('#confirm').focus();
                        $('#count').focus().select();
                    }
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";