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

zuozhengqing

2023-10-23 2d33e0c0fb91fbf58f7d7f415d56dffd96d6263b

 src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue

@@ -31,7 +31,8 @@
      searchOptions: [],
      keyword: "",
      locationId: 0,
      productId: ""
      productId: "",
      baseOperationType:""
    }
  },
  created() {
@@ -130,6 +131,7 @@
    // 请求数据
    async getData() {
      await historyInventoryAdjustment({
        baseOperationType:this.baseOperationType,
        locationId: this.locationId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,