Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 301cbea766080fb65b8c6af563388b61606322f3

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -168,7 +168,10 @@
    async getData() {
      if (this.params.name === "报表") {
        await getHistory({
          productId: this.params.id,
          keyWord:this.params.keyWord,
          produceId:this.params.produceId,
          unit:this.params.unit,
          productName:this.params.productName,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }).then((res) => {