Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

 HTML/views/WareHouseSetting/Locate.html

@@ -322,17 +322,29 @@
                     title: '所属仓库',
                     align: 'center',
                     width: 140,
                     fixed: 'left'
                     fixed: 'left',
                     templet: function(d) {

                        return d.WareHouseNo + '-' + d.WareHouseName;
                     }
                  }, {
                     field: 'RoadwayNo',
                     title: '所属巷道',
                     align: 'center',
                     width: 130,
                     templet: function(d) {

                        return d.RoadwayNo + '-' + d.RoadwayName;
                     }
                  }, {
                     field: 'AreaName',
                     title: '所属区域',
                     align: 'center',
                     width: 130,
                     templet: function(d) {

                        return d.AreaNo + '-' + d.AreaName;
                     }
                  }, {
                     field: 'LocatNo',
                     title: '储位编码',