Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/reportForm/inventoryReport/index.vue

@@ -31,8 +31,10 @@
        </div>
        <p style="margin-top: 30px">类别</p>
        <el-checkbox-group v-model="checkList" @change="checkListHandler">
          <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
        </el-checkbox-group>
          <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">
            {{ item.name }}
          </el-checkbox>
          </el-checkbox-group>
      </div>
      <div class="list-view">
        <div class="table">
@@ -86,7 +88,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"

export default {
  name: "InboundOutboundDetail",
  name: "inventoryReport",
  props: {},
  components: { AddOverviewDialog },
  mixins: [pageMixin],
@@ -146,7 +148,7 @@
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title,
      searchStr: ""
      searchStr: this.$route.params.name ?? ''
    }
  },
  created() {
@@ -217,42 +219,48 @@
          label: "单位成本",
          prop: "cost",
          default: false,
          isShowColumn: showcol.includes("单位成本")
          isShowColumn: showcol.includes("单位成本"),
          textAlign:"right"
        },
        {
          label: "总价值",
          prop: "value",
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "￥"
          unit: "￥",
          textAlign:"right"
        },
        {
          label: "在库",
          prop: "amount",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "可用库存",
          prop: "availableNumber",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "入库",
          prop: "in",
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "出库",
          prop: "out",
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "预测",
@@ -277,7 +285,7 @@
    getList(val) {
      this.searchStr = val
      this.getInventoryData({
        page: this.pagerOptions.currPage,
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
@@ -304,7 +312,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 +326,17 @@
      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,
          wareHouseCode:this.warehouseListName,
          productId:row.row.produceId,
          name:"库存报表"
        }
      })
    },
    // 预测
    handleForecast() {},
@@ -379,8 +399,8 @@
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          this.warehouseList = res.data.data
        if (res.code === 200) {
          this.warehouseList = res.data
        }
      })
    }
@@ -397,6 +417,7 @@
  .con_left {
    width: 200px;
    .el-checkbox-group {
      width:100%;
      display: flex;
      flex-direction: column;
    }
@@ -409,4 +430,18 @@
    flex: 1;
  }
}
::v-deep {
  .el-checkbox {
    padding: 5px;
  }
  .el-checkbox__label {
    width: 95%;
    box-sizing: border-box;
    padding-right: 5px;
    word-break: break-all;
    word-wrap: break-word;
    white-space: pre-wrap !important;
  }
}

</style>