Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 b12ea16fa2d9440e9680127d126a4f3af450afd2

 src/views/reportForm/inventoryReport/index.vue

@@ -143,7 +143,8 @@
      warehouseListName: "", // 仓库名称
      stashRadio: "1",
      pageSizes: [15, 30],
      oldRadioBtn: ""
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title
    }
  },
  created() {
@@ -159,12 +160,10 @@
    checkListHandler(e) {
      this.categoryListId = e
      this.getData()
      console.log(this.categoryListId, e, " 选中的产品id")
    },
    radioHandleChange(e) {
      this.warehouseListName = e
      this.getData()
      console.log(e, "单选")
    },
    setTable() {
      if (this.isIconIndex === "1") {
@@ -288,9 +287,15 @@
    },
    // 历史
    handleHistoryClick(row) {
      console.log(row)
      this.$router.push("/operate/allot")
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          name: "报表"
        }
      })
    },

    // 补货
    handleAddGoods(row) {
      console.log(row)
@@ -317,7 +322,6 @@
          unit: item.unit //单位
        }
        this.testArr.push(obj)
        console.log(this.testArr, "this")
      })
    },

@@ -332,7 +336,6 @@
      }
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          console.log(res.data, "接口请求成功")
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
@@ -360,7 +363,6 @@
      }).then((res) => {
        if (res.data.code === 200) {
          this.warehouseList = res.data.data
          console.log(this.warehouseList, "warehouseList")
        }
      })
    }