Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

 HTML/views/WareHouseSetting/Roadway.html

@@ -115,7 +115,7 @@
               for (var i = 0; i < res.data.length; i++) {
                  if (res.data[i].WareHouseNo == 'W01')
                  {
                     $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + 
                     $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
                     res.data[i].WareHouseName + '</option>');
                  }
                  
@@ -190,7 +190,11 @@
                        field: 'WareHouseName',
                        title: '所属仓库',
                        width: 120,
                        align: 'center'
                        align: 'center',
                        templet: function(d) {

                           return d.WareHouseNo + '-' + d.WareHouseName;
                        }
                        
                     }, {
                        field: 'RoadwayNo',