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

wtt

2025-08-21 fe1a4ed8d3a161bc555d4b3fbbce3a7e10a5fbcd

 WebTM/views/ÌõÂëÃ÷ϸ/Kf_BarCodeDetailQuery.html

@@ -335,13 +335,13 @@
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', hide: true };
                            }
                            else if (data1.list[key].ColmCols == "HMaterialJQty") {
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "重量_维护", width: 200, align: 'center',edit:true};
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "重量维护", width: 200, align: 'center',edit:true};
                            }
                            else if (data1.list[key].ColmCols == "HWeight_TL") {
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "投料克重_维护", width: 200, align: 'center',edit: true };
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "投料克重维护", width: 200, align: 'center',edit: true };
                            }
                            else if (data1.list[key].ColmCols == "HWeight_CP") {
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "实际克重_维护", width: 200, align: 'center',edit: true };
                                col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "实际克重维护", width: 200, align: 'center',edit: true };
                            }
                            else {
                                switch (data1.list[key].ColmCols) {
@@ -593,10 +593,11 @@
                    }
                    //投料克重格式校验
                    temp = option.data[i]["HWeight_TL"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行：投料克重_维护 ä¸èƒ½ä¸º0！");
                        return false;
                    } else if (!ref.test(temp)) {
                    //if (temp == "0") {
                    //    layer.msg("第" + (i + 1) + "行：投料克重_维护 ä¸èƒ½ä¸º0！");
                    //    return false;
                    //} else
                        if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行：投料克重_维护 è¯·è¾“入大于0的数字！");
                        return false;
                    }