Merge branch 'master' into Liudl

bklLiudl

2024-08-28 2bf4ac35e91c6a69bbaf43c79d6c5e96c3261288

 HTML/views/WareHouseSetting/AreaAddFrom.html

@@ -102,11 +102,11 @@
                        // $("#RoadwayNo").empty();
                        for (var i = 0; i < res.data.length; i++) {
                            //判断是否为立体库
                            if (res.data[i].WareHouseNo != "W02")
                            {
                            //if (res.data[i].WareHouseNo != "W02")
                            //{
                                $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                                res.data[i].WareHouseName + '</option>');
                            }
                            //}
                        } 
                        // $("select[name='WareHouseNo']").val(val); 
                        form.render('select');