Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

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

@@ -77,7 +77,7 @@

<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">
@@ -85,7 +85,7 @@
        <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,23 +108,24 @@
    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) {
                if (res.code === 200) {
                    if (res.data != null) {
                        $('#matName').val(res.data.matName);
                        console.log(res.data)
                        $('#matName').val(res.data.maktx);
                        $('#str1').val(res.data.str1);
                        $('#str2').val(res.data.str2);
                        countDom.val(initMatCount);
@@ -144,10 +145,11 @@
     */
    function confirm(){
        var data = {
            matNo: $('#matNo').val(),
            matName: $('#matName').val(),
            matnr: $('#matNo').val(),
            maktx: $('#matName').val(),
            count: countDom.val()
        };
        console.log(data)
        parent.addTableData(data);
        parent.layer.close(parent.matCodeLayerIdx);
    }
@@ -183,4 +185,4 @@
    }

</script>
</html>
</html>