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

zrg

2024-07-19 7b4ff2da15d571ea96f0d1eb5dd2dc60a7651faa

 WebTM/views/WMSɨÂëÄ£¿é/¿Í»§ÌõÂëɨÃè/Gy_getCusBarCodeBill_PDA.html

@@ -259,12 +259,14 @@
                if (HBarCode_Pre == "" || HBarCode_Pre_Flag != 1) {
                    playSound();
                    layer.msg("统一前缀不能为空，请设置统一前缀并确认！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    $('#HBarCode').val("");
                    return false;
                }

                if (sBarCode.indexOf(HBarCode_Pre) != 0) {
                    playSound();
                    layer.msg("条码前缀不为统一前缀，请检查条码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    $('#HBarCode').val("");
                    return false;
                }

@@ -439,15 +441,19 @@
                    data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": value, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data;
                            $("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);
                            if (result.data == null) {

                            HBarCode_Pre_Flag = 1;
                            } else {
                                var data = result.data;
                                $("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);

                            //禁用确认按钮
                            $('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//按钮变为不可编辑状态
                            //禁用 ç»Ÿä¸€å‰ç¼€ æ–‡æœ¬æ¡†
                            $('#HBarCode_Pre').prop('disabled', true);                     //统一前缀 æ–‡æœ¬æ¡†ä¸å¯ç¼–辑
                                HBarCode_Pre_Flag = 1;

                                //禁用确认按钮
                                $('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//按钮变为不可编辑状态
                                //禁用 ç»Ÿä¸€å‰ç¼€ æ–‡æœ¬æ¡†
                                $('#HBarCode_Pre').prop('disabled', true);                     //统一前缀 æ–‡æœ¬æ¡†ä¸å¯ç¼–辑  
                            }

                            judgeFlag = true;
                        }