Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 89ed9f5e5624b5b1383192ffafcb31f1a7d527d5

 src/views/reportForm/locationReport/index.vue

@@ -207,16 +207,24 @@
      })
    },
    getData() {
      this.getLocationData({
      if(this.$route.params.name==="库存报表"){
        this.getLocationData({
        keyWord:this.$route.params.keyWord,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      }else{
        this.getLocationData({
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        })
      }
    },

    // 搜索
    getList(val) {
      this.getLocationData({
        page: this.pagerOptions.currPage,
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
@@ -243,8 +251,10 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          row: row,
          // id: row.produceId,
          keyWord:row.productTypeName,
          produceId:row.id,
          productName:row.productName,
          unit:row.unit,
          name: "报表"
        }
      })