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">
@@ -26,11 +24,11 @@
          <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>
@@ -167,14 +165,16 @@
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "单位",
@@ -189,6 +189,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          textAlign:"right",
          unit: "￥"
        }
      ]
@@ -199,11 +200,8 @@
      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 || []
@@ -211,10 +209,29 @@
        }
      })
    },
    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) {
@@ -235,10 +252,14 @@
    },
    // 历史
    handleHistoryClick(row) {
      console.log(row)
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          keyWord:row.productTypeName,
          produceId:row.produceId,
          productName:row.productName,
          unit:row.unit,
          name: "报表"
        }
      })
@@ -250,4 +271,5 @@
</script>

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