Merge branch 'wxw'

Administrator

2024-06-17 0bd99d2747b1ce99f250a25776da0112ec5c32db

 HTML/views/WareHouseSetting/Locate.html

@@ -323,22 +323,24 @@
                     field: 'WareHouseName',
                     title: '所属仓库',
                     align: 'center',
                     width: 140,
                     width: 180,
                     fixed: 'left',
                     templet: function(d) {

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

                        return d.RoadwayNo + '-' + d.RoadwayName;
                     }
                  }, {
                  //       return d.RoadwayNo + '-' + d.RoadwayName;
                  //    }
                  // }, 
                  {
                     field: 'AreaName',
                     title: '所属区域',
                     align: 'center',
@@ -381,22 +383,24 @@
                     title: '深度',
                     align: 'center',
                     width: 70,
                  }, {
                     field: 'Height',
                     title: '高度',
                     align: 'center',
                     width: 90,
                  }, {
                     field: 'Weight',
                     title: '重量',
                     align: 'center',
                     width: 90,
                  }, {
                     field: 'TempName',
                     title: '存储坏境',
                     align: 'center',
                     width: 110,
                  }, {
                  }, 
                  // {
                  //    field: 'Height',
                  //    title: '高度',
                  //    align: 'center',
                  //    width: 90,
                  // }, {
                  //    field: 'Weight',
                  //    title: '重量',
                  //    align: 'center',
                  //    width: 90,
                  // }, {
                  //    field: 'TempName',
                  //    title: '存储坏境',
                  //    align: 'center',
                  //    width: 110,
                  // }, 
                  {
                     title: '操作',
                     fixed: 'right',
                     width: 120,