Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-18 f02c08d6540d0ea3a72ca3958e0e16d960fbbf8e

 src/views/reportForm/inventoryReport/index.vue

@@ -173,7 +173,8 @@
      }
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
@@ -331,6 +332,7 @@
    async getData() {
      let params = {
        categoryIds: this.categoryListId,
        keyWord:this.productName,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName