Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 89ed9f5e5624b5b1383192ffafcb31f1a7d527d5

Merge branch 'dev' into songshankun/adjust-style

 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) => {

 src/views/reportForm/inventoryReport/index.vue

@@ -86,7 +86,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"

export default {
  name: "InboundOutboundDetail",
  name: "inventoryReport",
  props: {},
  components: { AddOverviewDialog },
  mixins: [pageMixin],
@@ -277,7 +277,7 @@
    getList(val) {
      this.searchStr = val
      this.getInventoryData({
        page: this.pagerOptions.currPage,
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
@@ -304,7 +304,10 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          keyWord:row.productType,
          produceId:row.produceId,
          unit:row.unit,
          productName:row.productName,
          name: "报表"
        }
      })
@@ -315,8 +318,15 @@
      console.log(row)
    },
    // 位置
    handleLocation() {
      this.$router.push("/reportForm/locationReport")
    handleLocation(row) {
      console.log(row,"rowwww")
      this.$router.push({
        name:"locationReport",
        params:{
          keyWord:row.row.productName,
          name:"库存报表"
        }
      })
    },
    // 预测
    handleForecast() {},

 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: "报表"
        }
      })