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

zuozhengqing

2023-10-19 6b2aa7f0bb3f43e040ae2e659009e3bee3f3db1c

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

 src/assets/style/reset-element.scss

@@ -65,8 +65,8 @@

.el-button--primary {
  color: #fff;
  background-color: $color-primary !important;
  border-color: $color-primary !important;
  background-color: $color-primary;
  border-color: $color-primary;
}

.el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -81,6 +81,6 @@
}
.el-button--primary {
  color: #fff;
  background-color: #2a78fb !important;
  border-color: #2a78fb !important;
  background-color: #2a78fb;
  border-color: #2a78fb;
}

 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>
@@ -146,7 +146,7 @@
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title,
      searchStr:""
      searchStr: ""
    }
  },
  created() {
@@ -275,11 +275,11 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    getList(val) {
      this.searchStr=val
      this.searchStr = val
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord:val,
        keyWord: val
      })
    },
    // 行点击
@@ -351,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,

 src/views/reportForm/locationReport/index.vue

@@ -2,15 +2,15 @@
<template>
  <div class="rightContent">
    <div class="top">
        <SearchCommonView
          :add-title="'新建'"
          :showAdd="false"
          :placeholder="'请输入位置名称、产品名称或产品类别'"
          :amount-view="false"
          @addCommonClick="addBtnClick"
          @searchClick="getList"
          :isDisabled="true"
        />
      <SearchCommonView
        :add-title="'新建'"
        :showAdd="false"
        :placeholder="'请输入位置名称、产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
        :isDisabled="true"
      />
    </div>
    <div class="list-view">
      <div class="table">
@@ -24,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>
@@ -197,7 +197,7 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getLocationData(params){
    async getLocationData(params) {
      await getLocationData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data
@@ -226,7 +226,7 @@
      this.getLocationData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord:val
        keyWord: val
      })
    },
    // 行点击