Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq

zuozhengqing

2023-10-19 bd554a3040ab933a62335175203bfcbb22e9256a

 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>
@@ -118,7 +117,8 @@
    setTable() {
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
@@ -179,7 +179,7 @@
          prop: "unit",
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值")
          isShowColumn: showcol.includes("单位")
        },
        {
          label: "价值",
@@ -197,11 +197,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 || []
@@ -209,10 +206,28 @@
        }
      })
    },
    getData() {
      if(this.$route.params.name==="库存报表"){
        this.getLocationData({
        keyWord:this.$route.params.keyWord,
        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) {
@@ -236,7 +251,10 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          keyWord:row.productTypeName,
          produceId:row.id,
          productName:row.productName,
          unit:row.unit,
          name: "报表"
        }
      })