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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú²ðÏäµ¥/Sc_PackSplitBill_Fast.html

@@ -78,7 +78,7 @@
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" value="0" autocomplete="off" class="layui-input">
                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" value="0" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
                                        </div>
                                    </div>
                                </div>
@@ -225,12 +225,12 @@
                return vars;
            }

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            ////判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}

            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码
@@ -305,7 +305,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val(""); 
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '3784' },
                    success: function (d) {
@@ -494,8 +494,11 @@

        form.on('submit(Cancel)', function () {
            //sessionStorage["SourceFlag"] = false;
            parent.location.href = "../../../views/index.html"
            //parent.location.href = "../../../views/index.html"
            //window.close();//关闭当前页
            layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                parent.location.href = "../../../views/index_Mobile.html";
            });
        })

        //删除
@@ -539,12 +542,10 @@
            var HTBarCode = $('#HTBarCode').val()
            var HOrgID = sessionStorage["OrganizationID"]
            var sMaker = sessionStorage["HUserName"]
            if (AllowLoadData(sSubStr) != false)//非空验证
            {
                layer.load(3);
                $.ajax(
                {
                    type: "POST",
                    type: "GET",
                        url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
                    async: true,
                        data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
@@ -569,8 +570,6 @@
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                return false;
            } 
        });

        //监听提交
@@ -593,16 +592,13 @@
                if (event.keyCode == 13) {
                    var sBarCode = $('#HBarCode').val()
                    //var Flag = sessionStorage["SourceFlag"];
                    if (sQty == "") {
                        sQty = 0;
                    }
                    //判断条码是否为空  new
                    if (sBarCode == '') {
                    if (HBarCode == '') {
                            playSound();
                            layer.msg("条码为空，不能扫描！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        if (sBarCode != "") {
                        if (HBarCode != "") {
                            $('#HBarCode').val("");
                        }
                        $.ajax({
@@ -696,17 +692,17 @@
                    layer.msg("拖条码为空，不能扫描！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (HTBarCode != "") {
                    $('#HTBarCode').val("");
                }
                //if (HTBarCode != "") {
                //    $('#HTBarCode').val("");
                //}
                //
                $.ajax({
                    url: GetWEBURL() + "/PackSplitBill/SetPackBarCode_Webs",
                    type: "GET",
                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOrgID": HOrgID },
                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $('#HTBarCode').val(result.data.HSourceBillNo);
                            //$('#HTBarCode').val(result.data.HSourceBillNo);
                            $("#HTBarCode").attr("disabled", "true");

                            layer.load(3)
@@ -838,10 +834,12 @@
        //sessionStorage["HWHID"] = obj[0].HItemID;
        $("#HWHID").val(obj[0].HItemID);
    }
    function GetHSpValue(obj) {  //返回调入仓位
        $("#HStockPlaceName").val(obj[0].HName);
        $("#HStockPlaceID").val(obj[0].HItemID);
    }
        function GetHSpValue(obj) {  //返回调入仓位
            $("#HStockPlaceName").val(obj[0].HName);
            $("#HStockPlaceID").val(obj[0].HItemID);
            $("#HWHNAME").val(obj[0].HWhName);
            $("#HWHID").val(obj[0].HWHID);
        }
    function GetHKeeperValue(obj) {  //返回保管
        $("#HKeeper").val(obj[0].HName);
        $("#HKeeperID").val(obj[0].HItemID);
@@ -854,7 +852,13 @@
        $("#HDeptName").val(obj[0].HName);
        $("#HDeptID").val(obj[0].HItemID);
    }
    function AllowLoadData(sSubStr) {  //非空验证
        function AllowLoadData(sSubStr) {  //非空验证
            //数字正则(包含小数)
            var reg = /^\d+(\.\d+)?$/;
            //if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
            //    layer.msg("数量必须为数量或小数", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
        //if ($("#HSourceBillNo").val() == '') {
        //    layer.msg("请先扫源单!", { icon: 5 });
        //    return false;