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

yusijie

2024-12-16 9536b4d4acb04f9fcc77216c846b58397c02412f

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -1775,6 +1775,7 @@
            table.on('edit(mainTable)', function (obj) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var ref1 = /^-?\d+(\.\d+)?$/;          //判断字符串是否为数字(包含整数、浮点数)，正则表达式
                var temp = "";
                var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
@@ -1791,14 +1792,23 @@
                    case "HQty":                                         //数量
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                        if (!ref1.test(temp)) {
                            //恢复数据到编辑前
                            obj.update({
                                HQty: oldText
                            });
                            table.render(option);

                            layer.msg("数量请输入大于0的数字!");
                            layer.msg("数量请输入不为0的数字!");
                            return;
                        } else if (temp * 1 == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HQty: oldText
                            });
                            table.render(option);

                            layer.msg("数量请输入不为0的数字!");
                            return;
                        }

@@ -2035,7 +2045,15 @@
                    case "HMoney":                                         //金额
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0 ||obj.data.HQty == 0) {
                        if (!ref1.test(temp)) {
                            //恢复数据到编辑前
                            obj.update({
                                HMoney: oldText
                            });
                            table.render(option);
                            layer.msg("金额或数量请输入大于0的数字!");
                            return;
                        } else if (temp * 1 == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HMoney: oldText
@@ -2494,6 +2512,7 @@
            function AllowLoadData(data) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var ref1 = /^-?\d+(\.\d+)?$/;          //判断字符串是否为数字(包含整数、浮点数)，正则表达式
                var temp = "";

                //#region è¡¨å¤´æ•°æ®æ£€éªŒ
@@ -2560,13 +2579,13 @@
                        return false;
                    }

                    //实发数量格式校验
                    //数量格式校验
                    temp = option.data[i]["HQty"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：实收数量不能为0！");
                    if (!ref1.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：数量请输入不为0的数字！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：实收数量请输入大于0的数字！");
                    } else if (temp * 1 == 0) {
                        layer.msg("第" + (i + 1) + "行：数量请输入不为0的数字！");
                        return false;
                    }

@@ -2597,26 +2616,26 @@
                        return false;
                    }

                    //金额格式校验
                    temp = option.data[i]["HMoney"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：金额不能为0！");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：金额请输入大于0的数字！");
                        return false;
                    }

                    //价税合计格式校验
                    temp = option.data[i]["HTaxMoney"] + "";
                    ////金额格式校验
                    //temp = option.data[i]["HMoney"] + "";
                    //if (temp == "0") {
                    //    layer.msg("第" + (i + 1) + "行：价税合计不能为0！");
                    //    layer.msg("第" + (i + 1) + "行：金额不能为0！");
                    //    return false;
                    //} else 
                    if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：税额请输入大于0的数字！");
                        return false;
                    }
                    //} else if (!ref.test(temp)) {
                    //    layer.msg("第" + (i + 1) + "行：金额请输入大于0的数字！");
                    //    return false;
                    //}

                    ////价税合计格式校验
                    //temp = option.data[i]["HTaxMoney"] + "";
                    ////if (temp == "0") {
                    ////    layer.msg("第" + (i + 1) + "行：价税合计不能为0！");
                    ////    return false;
                    ////} else 
                    //if (!ref.test(temp)) {
                    //    layer.msg("第" + (i + 1) + "行：税额请输入大于0的数字！");
                    //    return false;
                    //}
                }
                //#endregion
                return true;