1.0.5 1.小太阳需求改动

王佳豪

2021-03-26 68ad4cf704c0a7c575936455d07e3e2f53fefbc4

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

@@ -48,13 +48,21 @@

<header class="layui-form">
    <div class="layui-input-inline">
        <label class="layui-form-label" style="margin-left: 32px">单号</label>
        <div class="layui-input-inline">
            <input id="billNo" class="layui-input" autocomplete="off" oninput="findCode(this, 'billNo')"
                   style="width: 175px">
        </div>
    </div>
    <div class="layui-input-inline">
        <label class="layui-form-label">物料编码</label>
        <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="扫码 / 输入" style="width: 65%"
        <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="扫码 / 输入"
               style="width: 175px"
               autocomplete="off">
    </div>
    <div class="layui-input-inline">
        <label class="layui-form-label" style="margin-left: 28px">库区</label>
        <div class="layui-input-inline" style="margin-left: 5px;width: 180px">
        <label class="layui-form-label" style="margin-left: 28px;">库区</label>
        <div class="layui-input-inline" style="margin-left: 5px;width: 175px">
            <select id="uuid" lay-filter="uuid">
                <option value="">请选择</option>
            </select>
@@ -87,7 +95,8 @@
    </div>
    <div class="form-item">
        <span>名称</span>
        <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled" readonly="readonly"></textarea>
        <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled"
                  readonly="readonly"></textarea>
    </div>
    <input id="index" type="text" disabled="disabled" style="display: none;">
    <div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
@@ -110,7 +119,7 @@
    // 表格数据
    var normalOutList = [];
    window.onload = function () {
        document.getElementById("matnr").focus();
        document.getElementById("billNo").focus();
    }

    /**
@@ -216,11 +225,12 @@

    var warehouseBar;
    var matnrBar;
    var billNo;

    /* 扫码、输入库区和物料编码 */
    function findCode(el, type) {
        warehouseBar = $('#uuid').val();
        ;
        billNo = $("#billNo").val();
        switch (type) {
            case 'uuid':
//                exist('uuid', 'locArea');
@@ -233,12 +243,12 @@
        }

        // 判断库区或者物料编码都不为空
        if (!warehouseBar || !matnrBar) {
            return;
        }
//        if (!warehouseBar || !matnrBar) {
//            return;
//        }

        $.ajax({
            url: baseUrl + "/locNormal/pda/out/query?matnr=" + matnrBar + "&warehouse=" + warehouseBar,
            url: baseUrl + "/locNormal/pda/out/query?matnr=" + (matnrBar ? matnrBar : "") + "&warehouse=" + (warehouseBar ? warehouseBar : "") + "&billNo=" + (billNo ? billNo : ""),
            headers: {'token': localStorage.getItem('token')},
//            contentType: 'application/json;charset=UTF-8',
            method: 'GET',
@@ -348,7 +358,7 @@
                if (res.code === 200) {
                    layer.msg("出库成功");
                    $("#matnr").val(null);
//                    $("#uuid").val(null);
                    $("#billNo").val(null);
                    warehouseBar = null;
                    matnrBar = null;
                    normalOutList = [];
@@ -367,6 +377,8 @@
    function reset() {
        $("#uuid").val(null);
        $("#matnr").val(null);
        $("#billNo").val(null);
        layui.form.render('select');
        normalOutList = [];
        tableIns.reload({data: normalOutList});
        layer.closeAll();