Merge remote-tracking branch 'origin/master'

YYC

2023-07-08 5f48e04bf4bc594121d2ef3f768407393f643fe7

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

@@ -30,7 +30,7 @@
                        shadeClose: true,
                        shade: 0.3,
                        closeBtn: 2,
                        offset: ['50px','50px'],
                        offset: ['50px', '50px'],
                        area: ['1000px', '640px'],
                        content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
                    });
@@ -55,34 +55,8 @@
});

window.onload = function () {
    // 加载视频
    initVideo(lprDto, null, null);
};

//控制流程环节显示
function showProgress() {
    if (!inoutProgress) {
        return;
    }
    if (inoutProgress.indexOf("REGISTER") == -1) {
        $("#progress-register").css("display", "none");
    }
    if (inoutProgress.indexOf("CHECK") == -1) {
        $("#progress-check").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
        $("#progress-fullWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("HANDLE") == -1) {
        $("#progress-hand").css("display", "none");
    }
    if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
        $("#progress-emptyWeight").css("display", "none");
    }
    if (inoutProgress.indexOf("CARD_BACK") == -1) {
        $("#progress-cardBack").css("display", "none");
    }
}

// socket信息返回處理
function socketOnMessage(packet) {
@@ -104,9 +78,7 @@
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有获取到身份证信息！", {
                    offset: ['300px', '300px']
                });
                alertError("没有获取到身份证信息！");
                return;
            }
            // 临时赋值
@@ -126,16 +98,15 @@
            }
        },
        error: function () {
            layer.alert("身份证读取失败！", {
                offset: ['300px', '300px']
            });
            layer.close(index);
            alertError("身份证读取失败！");
        }
    });
}

//使用插件读取智慧卡号
function flushICCard() {
   var index = layer.load();
    $("#intelCard").val(null);
    $.ajax({
        type: "GET",
@@ -146,83 +117,44 @@
        jsonp: "callback",
        jsonpCallback: "jsonpCallback",
        success: function (json) {
           layer.close(index);
            //console.log(json);
            var data = json.no;
            //console.log(data);
            if (data === "not found") {
                layer.alert("请重新读卡！", {offset: ['300px', '300px']});
                alertError("请重新读卡！");
            } else {
                $("#intelCard").val(data);
            }
        },
        error: function () {
            layer.alert("IC卡读取出错！", {offset: ['300px', '300px']});
           layer.close(index);
            alertError("IC卡读取出错！");
        }
    });
}

//读取车牌号
function flushPlateNum() {
    var param = JSON.stringify(lprDto);
function getPlateNum() {
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../inout/api/flush-lpr",
        url: "../../inout/api/get-plateNum",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        data: JSON.stringify(lprDto),
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg, {
                    offset: ['300px', '300px']
                });
                alertError(result.msg);
            } else {
                if (result.data.errorMsg) {
                    layer.alert(result.data.errorMsg, {
                        offset: ['300px', '300px']
                    });
                } else {
                    $("#plateNum").val(result.data.plateNum);
                }
                $("#plateNum").val(result.data.plateNum);
                $("#plateNum2").val(result.data.plateNum);
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("车牌识别失败！", {
                offset: ['300px', '300px']
            });
        }
    });
}

//重置车牌识别信息
function resetPlateNum() {
    var index = layer.load();
    var param = JSON.stringify(lprDto);
    $.ajax({
        type: "POST",
        url: "../../inout/api/reset-lpr",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg, {
                    offset: ['300px', '300px']
                });
            } else {
                layer.alert("重置成功，请重新获取车牌信息", {
                    offset: ['300px', '300px']
                });
            }
            layer.close(index);
        },
        error: function () {
            layer.close(index);
            layer.alert("重置执行失败", {
                offset: ['300px', '300px']
            });
            alertError("车牌识别失败！");
        }
    });
}
@@ -234,22 +166,21 @@
    // 身份证重置
    $("#id_img_pers").attr("src", "../../static/images/rkbk-photo_03.png");
    $("#pz-img").removeClass("kccz-r-img-red");
    $("#pz-text").text("自动抓拍");
}

// 当前完成
function submit() {
    var data = form.val("form-data");
    if (!data.userName) {
        notify("承运人信息不能为空", null);
        alertError("承运人信息不能为空");
        return;
    }
    if (!data.plateNum) {
        notify("车牌号不能为空", null);
        alertError("车牌号不能为空");
        return;
    }
    if (!data.intelCard && !data.userId) {
        notify("智慧卡号与身份证号不能同时为空", null);
    if (!data.userId) {
        alertError("身份证号不能为空");
        return;
    }

@@ -261,9 +192,8 @@
        progress: progress,
        bizType: bizType,
        plateNum: data.plateNum,
        id1: (null != lprDto) ? lprDto.id : null
        id1: lprDto.id
    };

    $.ajax({
        sync: false,
        type: "POST",
@@ -273,14 +203,12 @@
        data: JSON.stringify(snapData),
        success: function (result) {
            if (result.code != "0000") {
                layer.alert(result.msg);
                alertError(result.msg);
                submitData(data);
            } else {
                snapData = result.data;

                $("#pz-img").addClass("kccz-r-img-red");
                $("#pz-text").text("已拍照");

                submitData(data);
            }
        },
@@ -294,66 +222,28 @@
//执行保存数据
function submitData(data) {
    var index = layer.load();

    var files = [{
        fileName: snapData.fileName1
    }];
    data.files = files;

    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        url: "../../basic/inout/submit-register",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(data),
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                notify(result.msg, result.data);
                notifyProgress(result.msg, result.data);
            } else {
                notify("数据提交成功", result.data);
                // 重置页面
                notifyProgress("数据提交成功", result.data);
                resetForm();
            }
        },
        error: function () {
            layer.close(index);
            layer.alert("提交失败，请重新尝试！！");
            alertError("提交失败，请重新尝试！！");
        }
    });
}

/**
 * 弹出提醒框
 * @param msg 提醒信息
 * @param data 数据信息，可能为空
 */
function notify(msg, data) {
    if (data) {
        //赋值
        $("#resultMsg").text(msg);
        $("#resultUserName").text(data.userName);
        $("#resultPlateNum").text(data.plateNum);
        if ("IN" == data.type) {
            $("#resultType").text("入库-" + INOUT_PROGRESS_MSG(data.progress));
        } else {
            $("#resultType").text("出库-" + INOUT_PROGRESS_MSG(data.progress));
        }
        $("#resultIntelCard").text(data.intelCard);

        layer.open({
            type: 1,
            offset: ['150px', '200px'],
            area: '450px;',
            shade: 0.8,
            id: 'dialog_notify_info',
            btn: ['确定'],
            content: $('#dialog-from-notify'),
            yes: function (index) {
                layer.closeAll();
            }
        });
    } else {
        layer.alert(msg, {offset: ['300px', '300px']});
    }
}