Merge remote-tracking branch 'origin/zzq'

zzq

2023-09-28 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc

 src/views/reportForm/inventoryReport/index.vue

@@ -168,6 +168,7 @@
      stashRadio: "1",
      pageSizes: [15, 30],
      oldRadioBtn:"",
      metaTitle: this.$route.meta.title,
    };
  },
  created() {
@@ -182,18 +183,16 @@
  methods: {
    checkListHandler(e) {
      this.categoryListId = e;
      this.getData()
      console.log(this.categoryListId, e, " 选中的产品id");
      this.getData();
    },
    radioHandleChange(e) {
      this.warehouseListName=e
      this.getData()
      console.log(e, "单选");
      this.warehouseListName = e;
      this.getData();
    },
    setTable() {
      if (this.isIconIndex === "1") {
        this.pageSizes = [30, 60]
        this.pagerOptions.pageSize = 30
        this.pageSizes = [30, 60];
        this.pagerOptions.pageSize = 30;
      }
      this.tableList = {
        tableInfomation: [],
@@ -312,13 +311,36 @@
    },
    // 历史
    handleHistoryClick(row) {
      console.log(row)
      this.$router.push("/operate/allot");
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          name: this.metaTitle,
          product: {
            page: this.pagerOptions.currPage,
            pageSize: this.pagerOptions.pageSize,
            produceId: row.produceId,
            productName: row.productName,
            unit: row.unit,
    },
          pageName:"报表",
          paramsKey: {
            amount: "amount",
            status: "status", //状态
            productName:"productName", //产品名称
            contactedName: "contactedName",
            date: "date",
            fromLocation: "fromLocation",
            number: "number",
            toLocation: "toLocation",
            unit: "unit",
          },
        },
      });
    },

    // 补货
    handleAddGoods(row) {
      console.log(row)

      console.log(row);
    },
    // 位置
    handleLocation() {
@@ -342,7 +364,6 @@
          unit: item.unit, //单位
        };
        this.testArr.push(obj);
        console.log(this.testArr, "this");
      });
    },

@@ -357,10 +378,9 @@
      };
      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
          const list = res.data;
          this.tableList.tableInfomation = list || [];
          this.pagerOptions.totalCount = res.total;
        }
      });
    },
@@ -369,7 +389,7 @@
      await getProductCategoryList({
        keyWord: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
        pageSize: this.pagerOptions.pageSize,
      }).then((res) => {
        if (res.code === 200) {
          this.categoryList = res.data;
@@ -381,11 +401,10 @@
      await getWarehouseList({
        keyword: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
        pageSize: this.pagerOptions.pageSize,
      }).then((res) => {
        if (res.data.code === 200) {
          this.warehouseList = res.data.data;
          console.log(this.warehouseList, "warehouseList");
        }
      });
    },