扫码弹窗问题解决

YYC

2023-07-08 f4a892233ef13cd34ca772185eaf789d0e850b37

扫码弹窗问题解决

 igds-web/src/main/resources/static/admin/inout/in-check.js

@@ -67,11 +67,21 @@
    //显示入库流程
    showProgress();
});
window.onbeforeunload = function () {
    console.log('页面刷新之前触发');
}

window.onunload = function () {
    console.log('页面刷新完成触发');
}
window.onload = function () {

    //扫描枪自动回车事件
    $('#checkId').bind('keyup', function(event) {
        if (event.keyCode == "13") {
            // //去掉焦点，防止刷新页面
            // $('#checkId').blur();
            console.log("in-check", "扫码枪");
            getDataByCheckId();
        }
    });
@@ -175,6 +185,7 @@
    });
    form.render();
    var data = form.val("form-detail");
    console.log("getPriceByFoodLevel")

    $.ajax({
        type: "POST",
@@ -185,7 +196,9 @@
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
                console.log("getPriceByFoodLevel", "!=0000")
            } else {
                console.log("getPriceByFoodLevel", "==0000")
                $("#check-result-tip2").text("粮食定价：" + result.data.price + "元/公斤");
            }
        },
@@ -217,6 +230,7 @@
    // var url = "com.ld.igds.inout.ReportInoutCheck.d";
    // window.parent.openTab(url, "化验结果导出", "checkDataExport");
};

// 扦样机解除急停
function checkResetStop() {
    var param = JSON.stringify(checkDto);
@@ -274,6 +288,7 @@
 * 渲染表格
 */
function renderTableCheckItem() {
    console.log("renderTableCheckItem")
    // 清空数据
    $("#tableCheckItem").empty();
    table.render({
@@ -359,7 +374,6 @@

function showDetail(data) {
    curCheckData = data;

    if (!curCheckData.checkTime) {
        curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
    }
@@ -368,6 +382,7 @@
    // 赋值
    form.val("form-detail", curCheckData);
    form.render();
    console.log("showDetail");

    layer.open({
        type: 1,
@@ -378,15 +393,18 @@
        btnAlign: 'c',
        btn: ['仅保存', '保存提交','关闭取消'],
        yes: function () {
            console.log("showDetail", "btn1")
            // 更新到页面
            var data = form.val("form-detail");
            // 合并更新當前编辑数据
            Object.assign(curCheckData, data);
            saveCheckData();
            if(scanCodeTag){
                console.log("showScanCode")
                showScanCode();
            }
        }, btn2: function () {
            console.log("showDetail", "btn2")
            // 更新到页面
            var data = form.val("form-detail");
            // 合并更新當前编辑数据
@@ -397,13 +415,14 @@
            }
        }, btn3: function () {
            parent.layer.closeAll();
            console.log("showDetail", "btn3")
            if(scanCodeTag){
                showScanCode();
            }
        },
        closeBtn: 0
    });

    console.log("showDetail", "end");
    // 获取化验项信息
    flushCheckItem(curCheckData.foodVariety);
    getPriceByFoodLevel(curCheckData.foodLevel);
@@ -417,8 +436,8 @@
    $("#check-result-tip").text("检验结果：#");
    $("#price-result-tip2").text("粮食定价：#元/公斤");
    curCheckData.foodVariety = foodVariety;

    var index = layer.load();
    console.log("flushCheckItem")
    $.ajax({
        type: "POST",
        url: "../../basic/inout/get-check-item",
@@ -427,9 +446,11 @@
        data: JSON.stringify(curCheckData),
        success: function (result) {
            if (result.code != "0000") {
                console.log("flushCheckItem", "!==0000")
                layer.msg(result.msg);
            } else {
                curCheckItems = result.data;
                console.log("flushCheckItem", "==0000")
                // 根据化验结果提醒是否合格
                updateCheckResultTip();
                // 页面渲染检测项
@@ -438,10 +459,12 @@
            }
        },
        error: function () {
            console.log("flushCheckItem", "error")
            layer.close(index);
            layer.msg("后台异常，请重试或者联系管理员！！");
        }
    });
    console.log("flushCheckItem", "end")
};

//仅保存
@@ -567,11 +590,13 @@
        data: JSON.stringify(param),
        success: function (result) {
            if (result.code != "0000") {
                console.log("success", "!=0000")
                layer.close(index);
                $("#form-sacnCodeDetail")[0].reset();
                form.render();
                notify(result.msg, result.data);
            } else {
                console.log("success", "==0000")
                updateSelect();
                showDetail(result.data);
            }

 igds-web/src/main/resources/templates/admin/inout/in-check.html

@@ -111,6 +111,7 @@
        .input_ba {
            background: #e7eaec !important;
        }

        .layui-layer-btn .layui-layer-btn1 {
            border-color: #53adce;
            background-color: #53adce;
@@ -374,7 +375,7 @@
</body>

<!-- 扫码弹窗 -->
<div class="layui-tab-content" id="scanCodeDetail" style="display: none;">
<div class="layui-tab-content" id="scanCodeDetail" style="display: none;" οnsubmit="return false;">
    <!-- 表单基本信息 -->
        <form class="layui-form" id="form-sacnCodeDetail" lay-filter="form-sacnCodeDetail">
            <div class="layui-col-xs12">
@@ -382,6 +383,9 @@
                    <label class="layui-form-label">质检单号</label>
                    <div class="layui-input-block">
                        <input type="text" id="checkId" name="checkId" placeholder="请扫码，也可手动输入" class="layui-input">
                    <!--这行代码不能删-->
                    <!--当form表单中只有一个input时按回车按键会刷新页面，因此添加一个input并隐藏，不能使用type="hidden"方式隐藏-->
                    <input type="text" id="hiddenText" name="hiddenText" style="display:none"/>
                    </div>
                </div>
            </div>

 igds-web/src/main/resources/templates/admin/inout/out-card-back.html

@@ -262,29 +262,54 @@
                                    </select>
                                </div>
                            </div>

                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食品种</label>
                                <label class="layui-form-label">出入库类型</label>
                                <div class="layui-input-block">
                                    <select name="foodVariety" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodVariety}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    <select name="type" disabled>
                                        <option value="OUT">出库作业</option>
                                        <option value="IN">入库作业</option>
                                    </select>
                                </div>
                            </div>

                            <div class="layui-form-item">
                                <label class="layui-form-label">粮食等级</label>
                                <label class="layui-form-label">流程进度</label>
                                <div class="layui-input-block">
                                    <select name="foodLevel" disabled>
                                        <option value="">自动获取</option>
                                        <option th:each="dic,dicSet:${listFoodLevel}"
                                                th:value="${dic.code}" th:text="${dic.name}"></option>
                                    <select name="progress" disabled>
                                        <option value="REGISTER">登记环节</option>
                                        <option value="CHECK">质检环节</option>
                                        <option value="HANDLE">值仓环节</option>
                                        <option value="WEIGHT_TAG">称重环节</option>
                                        <option value="WEIGHT_FULL">称重环节</option>
                                        <option value="WEIGHT_EMPTY">称重环节</option>
                                        <option value="CARD_BACK">离库确认</option>
                                        <option value="RECORD">流程完成</option>
                                    </select>
                                </div>
                            </div>

                            <!--                            <div class="layui-form-item">-->
                            <!--                                <label class="layui-form-label">粮食品种</label>-->
                            <!--                                <div class="layui-input-block">-->
                            <!--                                    <select name="foodVariety" disabled>-->
                            <!--                                        <option value="">自动获取</option>-->
                            <!--                                        <option th:each="dic,dicSet:${listFoodVariety}"-->
                            <!--                                                th:value="${dic.code}" th:text="${dic.name}"></option>-->
                            <!--                                    </select>-->
                            <!--                                </div>-->
                            <!--                            </div>-->

                            <!--                            <div class="layui-form-item">-->
                            <!--                                <label class="layui-form-label">粮食等级</label>-->
                            <!--                                <div class="layui-input-block">-->
                            <!--                                    <select name="foodLevel" disabled>-->
                            <!--                                        <option value="">自动获取</option>-->
                            <!--                                        <option th:each="dic,dicSet:${listFoodLevel}"-->
                            <!--                                                th:value="${dic.code}" th:text="${dic.name}"></option>-->
                            <!--                                    </select>-->
                            <!--                                </div>-->
                            <!--                            </div>-->

                            <div class="layui-form-item">
                                <label class="layui-form-label">往来单位</label>
                                <div class="layui-input-block">

 igds-web/src/main/resources/templates/admin/inout/out-handle.html

@@ -297,16 +297,16 @@
                                </div>
                            </div>

                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item">-->
                            <!--                                    <label class="layui-form-label">净&nbsp;&nbsp;&nbsp;&nbsp;重</label>-->
                            <!--                                    <div class="layui-input-block">-->
                            <!--                                        <input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"-->
                            <!--                                               class="layui-input rkbk-search-input" disabled> <em-->
                            <!--                                            class="kccz-data-dw">KG</em>-->
                            <!--                                    </div>-->
                            <!--                                </div>-->
                            <!--                            </div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">净&nbsp;&nbsp;&nbsp;&nbsp;重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>


                            <!-- <div class="layui-col-xs4">-->
@@ -349,23 +349,23 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">质检增重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
                                        </button>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="addCheck" type="text" name="addCheck" placeholder="请输入"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item kccz-data-group-md">-->
                            <!--                                    <label class="layui-form-label">质检增重</label>-->
                            <!--                                    <div class="posi-r kccz-data-bfb fr">-->
                            <!--                                        <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">-->
                            <!--                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细-->
                            <!--                                        </button>-->
                            <!--                                    </div>-->
                            <!--                                    <div class="layui-input-block">-->
                            <!--                                        <div class="posi-r">-->
                            <!--                                            <input id="addCheck" type="text" name="addCheck" placeholder="请输入"-->
                            <!--                                                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                                                class="kccz-data-dw">KG</em>-->
                            <!--                                        </div>-->
                            <!--                                    </div>-->
                            <!--                                </div>-->
                            <!--                            </div>-->
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">水分增重</label>-->
@@ -406,22 +406,31 @@
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">质检扣重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">
                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细
                                        </button>
                                    </div>
                                <div class="layui-form-item">
                                    <label class="layui-form-label color-red">粮食产地</label>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input id="deCheck" type="text" name="deCheck" placeholder="请输入"
                                                   autocomplete="off" class="layui-input weight"> <em
                                                class="kccz-data-dw">KG</em>
                                        <input type="text" name="foodLocation" placeholder="不可编辑"
                                               autocomplete="off" class="layui-input" disabled="disabled">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item kccz-data-group-md">-->
                            <!--                                    <label class="layui-form-label">质检扣重</label>-->
                            <!--                                    <div class="posi-r kccz-data-bfb fr">-->
                            <!--                                        <button type="button" class="rkbk-quick-btn layui-btn" onclick="showCheck()">-->
                            <!--                                            <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>详细-->
                            <!--                                        </button>-->
                            <!--                                    </div>-->
                            <!--                                    <div class="layui-input-block">-->
                            <!--                                        <div class="posi-r">-->
                            <!--                                            <input id="deCheck" type="text" name="deCheck" placeholder="请输入"-->
                            <!--                                                   autocomplete="off" class="layui-input weight"> <em-->
                            <!--                                                class="kccz-data-dw">KG</em>-->
                            <!--                                        </div>-->
                            <!--                                    </div>-->
                            <!--                                </div>-->
                            <!--                            </div>-->

                            <!--                            <div class="layui-col-xs4">-->
                            <!--                                <div class="layui-form-item">-->