Merge remote-tracking branch 'origin/zzq'

zzq

2023-09-28 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc

 src/views/reportForm/locationReport/index.vue

@@ -56,7 +56,7 @@

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import { getLocationData,} from "@/api/locationApi/locationApi";
import { getLocationData } from "@/api/locationApi/locationApi";
import AddOverviewDialog from "@/views/overview/AddOverviewDialog";

export default {
@@ -74,7 +74,7 @@
      //   { label: "预留数量", unit: "" },
      //   { label: "价值", unit: "￥" },
      // ],
      countcol:["在库数量","预留数量","价值"],
      countcol: ["在库数量", "预留数量", "价值"],
      testArr: [
        {
          product: "HC/销售区/b区",
@@ -114,6 +114,7 @@
      },
      productId: this.$route.params.id,
      productName: this.$route.params.name,
      metaTitle: this.$route.meta.title,
    };
  },
  created() {
@@ -171,14 +172,14 @@
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit:""
          unit: "",
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit:""
          unit: "",
        },
        {
          label: "单位",
@@ -193,7 +194,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          unit:"￥"
          unit: "￥",
        },
      ];
      return tableColumn;
@@ -209,10 +210,9 @@
        pageSize: this.pagerOptions.pageSize,
      }).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;
        }
      });
    },
@@ -232,14 +232,40 @@
    addBtnClick() {
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.getData()
      this.getData();
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
    },
    // 历史
    handleHistoryClick() {},
    handleHistoryClick(row) {
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          name: this.metaTitle,
          pageName:"报表",
          product: {
            page: this.pagerOptions.currPage,
            pageSize: this.pagerOptions.pageSize,
            produceId: row.produceId,
            productName: row.productName,
            unit: row.unit,
          },
          paramsKey: {
            amount: "amount",
            productName:"productName",
            status: "status",
            contactedName: "contactedName",
            date: "date",
            fromLocation: "fromLocation",
            number: "number",
            toLocation: "toLocation",
            unit: "unit",
          },
        },
      });
    },
    // 补货
    handleAddGoods() {},
  },