Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 d7557c1681b2da87df6509b3faf5dc4cefac1da2

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -168,10 +168,10 @@
    async getData() {
      if (this.params.name === "报表") {
        await getHistory({
          keyWord:this.params.row.productTypeName,
          produceId:this.params.row.id,
          productName:this.params.row.productName,
          unit:this.params.row.unit,
          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) => {