1.0.3 pda关联组托-隐藏物料名称，改为显示生成单号

王佳豪

2021-03-13 7786552f47c9fbc3d233321e5484ef33da116e6a

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

@@ -98,6 +98,24 @@
    <button id="remove" onclick="remove()">移除</button>
    <button id="confirm" onclick="confirm()">保存</button>
</div>

<!-- 显示生成单号弹窗 -->
<div id="warehouseModal" style="display: none; text-align: center; padding-top: 10px">
    <div class="form-item">
        <span>物料</span>
        <input id="matNo2" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>名称</span>
        <input id="matName2" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>生成单号</span>
        <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
    </div>
    <button onclick="closeWarehouse()" style="margin-top: 8px">关闭</button>
</div>

</body>
<script>
    window.onload = function(){document.getElementById("code").focus();}
@@ -116,8 +134,9 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', event: 'modify', style:'cursor: pointer;color: blue', width:50},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
                {field: 'matNo', align: 'center', title: '物料编码', event: 'warehouse', style: 'cursor: pointer;color: blue'},
                {field: 'warehouse', align: 'center', title: '生成单号'}
//                {field: 'matName', align: 'center', title: '物料名称'}
            ]],
            done: function (res, curr, count) {
            }
@@ -143,10 +162,30 @@
                        }
                    });
                    break;
                case 'warehouse':
                    layer.open({
                        type: 1,
                        offset: '20px',
                        title: '生成单号明细',
                        shadeClose: true,
                        area: ['80%', '180px'],
                        content: $("#warehouseModal"),
                        success: function (layero, index) {
                            $('#matNo2').val(data.matNo);
                            $('#matName2').val(data.matName);
                            $('#warehouse').val(data.warehouse);
                        }
                    });
                    break;
            }
        });

    });

    /* 关闭生成单号明细 */
    function closeWarehouse() {
        layer.closeAll();
    }

    function findCode(el) {
        if (el.value.length === 7) {
@@ -160,7 +199,7 @@
        for (var i=0;i<data.length;i++) {
            var toPush = true;
            for (var j=0;j<matData.length;j++){
                if (data[i].matNo === matData[j].matNo) {
                if (data[i].matNo === matData[j].matNo && data[i].warehouse === matData[j].warehouse) {
                    matData[j].count = Number(matData[j].count) + Number(data[i].count);
                    toPush  = false;
                }
@@ -181,7 +220,8 @@
        if (isEmpty(el.value)) {
            return;
        }
        var billNo = el.value.split(",")[0].split("=")[1];
//        var billNo = el.value.split(",")[0].split("=")[1];
        var billNo = el.value;
        if (isEmpty(billNo)) {
            return;
        }