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

zuozhengqing

2023-10-28 c356ebfc46d6f98afb6eebc252db2db6718e25f2

 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,