Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/reportForm/locationReport/index.vue

@@ -2,17 +2,15 @@
<template>
  <div class="rightContent">
    <div class="top">
      <div>
        <SearchCommonView
          :add-title="'新建'"
          :showAdd="true"
          :placeholder="'请输入参考'"
          :amount-view="false"
          @addCommonClick="addBtnClick"
          @searchClick="getList"
          :isDisabled="true"
        />
      </div>
      <SearchCommonView
        :add-title="'新建'"
        :showAdd="false"
        :placeholder="'请输入位置名称、产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
        :isDisabled="true"
      />
    </div>
    <div class="list-view">
      <div class="table">
@@ -21,15 +19,16 @@
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
          :showSummary="true"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="210" align="center">
              <template slot-scope="scope">
                <span @click="handleHistoryClick(scope.row)">
                <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <span @click="handleAddGoods(scope)" class="margin_left_5px">
                <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                  <i class="el-icon-refresh"></i>
                  <span>补货</span>
                </span>
@@ -48,9 +47,9 @@
</template>

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

export default {
  name: "InventoryReport",
@@ -107,8 +106,8 @@
      },
      productId: this.$route.params.id,
      productName: this.$route.params.name,
      metaTitle: this.$route.meta.title,
    };
      metaTitle: this.$route.meta.title
    }
  },
  created() {
    this.setTable()
@@ -118,7 +117,8 @@
    setTable() {
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
@@ -166,6 +166,7 @@
          isShowColumn: true,
          default: true,
          unit: "",
          textAlign:"right"
        },
        {
          label: "预留数量",
@@ -173,13 +174,14 @@
          isShowColumn: true,
          default: true,
          unit: "",
          textAlign:"right"
        },
        {
          label: "单位",
          prop: "unit",
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值")
          isShowColumn: showcol.includes("单位")
        },
        {
          label: "价值",
@@ -187,32 +189,49 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          unit: "￥",
        },
      ];
      return tableColumn;
          textAlign:"right",
          unit: "￥"
        }
      ]
      return tableColumn
    },
    selTableCol(val) {
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData() {
      await getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
    async getLocationData(params) {
      await getLocationData(params).then((res) => {
        if (res.code === 200) {
          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
        }
      })
    },
    getData() {
      if(this.$route.params.name==="库存报表"){
        this.getLocationData({
        wareHouseCode:this.$route.params.wareHouseCode,
        productId:this.$route.params.productId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      }else{
        this.getLocationData({
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        })
      }
    },

    // 搜索
    getList(val) {
      console.log(val)
      this.getLocationData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
    },
    // 行点击
    tableRowClick(row) {
@@ -223,9 +242,9 @@
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.getData();
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.getData()
    },
    // 状态
    getStatus(val) {
@@ -233,31 +252,17 @@
    },
    // 历史
    handleHistoryClick(row) {
      console.log(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",
          },
        },
      });
          keyWord:row.productTypeName,
          produceId:row.produceId,
          productName:row.productName,
          unit:row.unit,
          name: "报表"
        }
      })
    },
    // 补货
    handleAddGoods() {}
@@ -266,4 +271,5 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
</style>