Merge remote-tracking branch 'origin/master'

cuikaidong

昨天 1c1000a93a88b5af5eabbf410aa264b0911dbee4

 src/views/tms/GoodsShelvesList.vue

@@ -202,6 +202,11 @@
            dataIndex: 'columnNumber'
          },
          {
            title:'格数',
            align:"center",
            dataIndex: 'cellsNum'
          },
          {
            title:'货架编号',
            align:"center",
            dataIndex: 'shelfNumber'
@@ -262,12 +267,8 @@
    mounted() {
      this.handleGetCurrSelected = (data) => {
        this.treeSelected = data;
        if (data.entity && data.entity.leafFlag === '1') {
          this.queryParam.warehouseId = data.key;
          this.loadData();
        } else {
          this.dataSource = []
        }
        this.queryParam.warehouseId = data.key;
        this.loadData();
      }
      this.$bus.$on('getCurrSelected', this.handleGetCurrSelected);
    },