Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-12-05 c035b3104d3fc7d63bc00b3a42f6dd8cb419bd32

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html

@@ -164,6 +164,7 @@
            , element = layui.element;

        var HSourceInterID = 0;
        var HBillNo = 0;
        //#endregion

        //#region åˆå§‹åŒ–界面
@@ -173,6 +174,8 @@
        var params = get_UrlVars();
        if (typeof (params[params[0]]) != "undefined") {
            var HSourceInterID = params[params[0]];//操作类型
            var HBillType = params[params[1]];//操作类型
            var HBillNo = params[params[2]];//操作类型
        }

        //#endregion
@@ -245,6 +248,11 @@
                        layer.close(index);

                        if (result.code == "1") {
                            if (HBillType == "KG") {
                                //存储刷卡人
                                get_AddHCardswiper(data2.HEmpID, data2.HEmpName);
                            }
                          
                            layer.msg("匹配!", { time: 1 * 1000, icon: 1 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 1, "HName": $("#HEmpName").val() });
                                setTimeout(function () {
@@ -280,7 +288,32 @@
                }
            });
        }

        //保存刷卡人
        function get_AddHCardswiper(HEmpID, HEmpName) {
            var index = layer.load();
            var sMainStr = JSON.stringify({ "HBillNo_bak": HBillNo, "HEmpID": HEmpID, "HCardswiperMan": HEmpName});
            var sMainSub = sMainStr;
            $.ajax({
                url: GetWEBURL() + "/Sc_MESBeginWorkBill/AddHCardswiper",
                async: false,
                data: { "msg": sMainSub },
                type: "POST",
                dataType: "json",
                success: function (result) {
                    if (result.count == 1) {
                        layer.close(index);
                    }
                    else {
                        layer.close(index);
                        layer.alert(data.Message, { icon: 5 })
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
        function get_UrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');