Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 301cbea766080fb65b8c6af563388b61606322f3

 src/views/reportForm/inventoryReport/index.vue

@@ -46,20 +46,20 @@
            <template slot="tableButton">
              <el-table-column label="操作" width="220" 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>
                  <template>
                    <span @click="handleLocation(scope)" class="margin_left_5px">
                    <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor">
                      <i class="el-icon-menu"></i>
                      <span>位置</span>
                    </span>
                    <span @click="handleForecast(scope)" class="margin_left_5px">
                    <span @click="handleForecast(scope)" class="margin_left_5px no-cursor">
                      <i class="el-icon-s-data"></i>
                      <span>预测</span>
                    </span>
@@ -86,7 +86,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"

export default {
  name: "InboundOutboundDetail",
  name: "inventoryReport",
  props: {},
  components: { AddOverviewDialog },
  mixins: [pageMixin],
@@ -146,7 +146,7 @@
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title,
      searchStr:""
      searchStr: this.$route.params.name ?? ''
    }
  },
  created() {
@@ -275,11 +275,11 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    getList(val) {
      this.searchStr=val
      this.searchStr = val
      this.getInventoryData({
        page: this.pagerOptions.currPage,
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord:val,
        keyWord: val
      })
    },
    // 行点击
@@ -304,7 +304,10 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          keyWord:row.productType,
          produceId:row.produceId,
          unit:row.unit,
          productName:row.productName,
          name: "报表"
        }
      })
@@ -315,8 +318,15 @@
      console.log(row)
    },
    // 位置
    handleLocation() {
      this.$router.push("/reportForm/locationReport")
    handleLocation(row) {
      console.log(row,"rowwww")
      this.$router.push({
        name:"locationReport",
        params:{
          keyWord:row.row.productName,
          name:"库存报表"
        }
      })
    },
    // 预测
    handleForecast() {},
@@ -341,18 +351,18 @@

    //接口请求-----------------------------------------------------------------------------------------------
    // 获取库存报表数据
    async getInventoryData(params){
    async getInventoryData(params) {
      await getInventoryData(params).then((res) => {
          if (res.code === 200) {
            const list = res.data
            this.tableList.tableInfomation = list || []
            this.pagerOptions.totalCount = res.total
          }
        })
        if (res.code === 200) {
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    getData() {
      let params = {
        keyWord:this.searchStr,
        keyWord: this.searchStr,
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,