Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/reportForm/locationReport/index.vue

@@ -165,14 +165,16 @@
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"right"
        },
        {
          label: "单位",
@@ -187,6 +189,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          textAlign:"right",
          unit: "￥"
        }
      ]
@@ -209,7 +212,8 @@
    getData() {
      if(this.$route.params.name==="库存报表"){
        this.getLocationData({
        keyWord:this.$route.params.keyWord,
        wareHouseCode:this.$route.params.wareHouseCode,
        productId:this.$route.params.productId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
@@ -248,11 +252,12 @@
    },
    // 历史
    handleHistoryClick(row) {
      console.log(row)
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          keyWord:row.productTypeName,
          produceId:row.id,
          produceId:row.produceId,
          productName:row.productName,
          unit:row.unit,
          name: "报表"
@@ -266,4 +271,5 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
</style>