Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 301cbea766080fb65b8c6af563388b61606322f3

 src/views/reportForm/inventoryReport/index.vue

@@ -3,8 +3,9 @@
  <div class="rightContent">
    <div class="top">
      <SearchCommonView
        :showAdd="false"
        :add-title="'新建'"
        :placeholder="'请输入参考'"
        :placeholder="'请输入产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -21,11 +22,11 @@
              v-for="(item, index) in warehouseList"
              :key="index"
              v-model="stashRadio"
              :label="item.name"
              :label="item.code"
              @change="radioHandleChange"
              >{{ item.name }}</el-radio
            >
            <!-- <el-radio v-model="stashRadio" label="2">备选项</el-radio> -->
            <!-- @click.prevent.native="checkRadio(item.code)"   取消单选项 -->
          </template>
        </div>
        <p style="margin-top: 30px">类别</p>
@@ -45,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>
@@ -85,7 +86,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"

export default {
  name: "InboundOutboundDetail",
  name: "inventoryReport",
  props: {},
  components: { AddOverviewDialog },
  mixins: [pageMixin],
@@ -144,7 +145,8 @@
      stashRadio: "1",
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title
      metaTitle: this.$route.meta.title,
      searchStr: this.$route.params.name ?? ''
    }
  },
  created() {
@@ -165,6 +167,12 @@
      this.warehouseListName = e
      this.getData()
    },
    // checkRadio(val){
    //   console.log(val)
    //   val == this.stashRadio ? this.stashRadio = '' : this.stashRadio = val
    //   this.warehouseListName = val
    //   this.getData()
    // },
    setTable() {
      if (this.isIconIndex === "1") {
        this.pageSizes = [30, 60]
@@ -172,7 +180,8 @@
      }
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
@@ -266,7 +275,12 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    getList(val) {
      console.log(val)
      this.searchStr = val
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
    },
    // 行点击
    tableRowClick(row) {
@@ -278,8 +292,8 @@
    // 新建
    addBtnClick() {
      // this.editConfig.visible = true;
      this.editConfig.title = "新建"
      this.getData()
      // this.editConfig.title = "新建"
      // this.getData()
    },
    // 状态
    getStatus(val) {
@@ -290,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: "报表"
        }
      })
@@ -301,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() {},
@@ -327,13 +351,7 @@

    //接口请求-----------------------------------------------------------------------------------------------
    // 获取库存报表数据
    async getData() {
      let params = {
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName
      }
    async getInventoryData(params) {
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data
@@ -342,6 +360,16 @@
        }
      })
    },
    getData() {
      let params = {
        keyWord: this.searchStr,
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName
      }
      this.getInventoryData(params)
    },
    // 获取产品类型列表数据
    async getProductCategoryList() {
      await getProductCategoryList({