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

zuozhengqing

2023-11-13 f16c444ad4d0478fa73c7005d7e94b551963769b

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

 src/views/operate/orderPoint/index.vue

@@ -113,13 +113,13 @@
    }
  },
  created() {
    if(this.$route.params.productId){
    if (this.$route.params.productId) {
      this.getData({
        productId:this.$route.params.productId,
        pageSize:15,
        page:1
        productId: this.$route.params.productId,
        pageSize: 15,
        page: 1
      })
    }else{
    } else {
      this.getData()
    }
    this.setTable()
@@ -153,7 +153,7 @@
        keyWord: data?.jointName,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        productId:data?.productId
        productId: data?.productId
      }).then((res) => {
        if (res.code === 200) {
          console.log(res)
@@ -241,6 +241,7 @@
          editable: false,
          isOrder: true
        })
        this.tableList.tableData = this.tableData
        this.locationId = 0
        this.productId = 0
      } else {

 src/views/productManage/product/index.vue

@@ -37,6 +37,9 @@
              v-if="item.attachmentList?.length > 0"
              style="width: 60px; height: 80px"
              :src="item.attachmentList[0].FileUrl"
              :preview-src-list="item.srcList"
              :z-index="9999"
              @click.stop="imgClick"
            ></el-image>
            <div v-else class="img-view">
              <i class="el-icon-picture-outline"></i>
@@ -246,8 +249,20 @@
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data.map((item) => {
            let srcList = []
            if (item.attachmentList?.length > 0) {
              item.attachmentList.forEach((ele) => {
                if (ele.fileType === "picture") {
                  srcList.push(ele.FileUrl)
                }
              })
            } else {
              srcList = []
            }

            return {
              ...item
              ...item,
              srcList
            }
          })
          this.tableList.tableInfomation = list || []
@@ -302,7 +317,8 @@
    delSelectClick() {
      this.categoryId = 0
      this.getData()
    }
    },
    imgClick() {}
  }
}
</script>

 src/views/reportForm/inventoryReport/index.vue

@@ -34,7 +34,7 @@
          <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">
            {{ item.name }}
          </el-checkbox>
          </el-checkbox-group>
        </el-checkbox-group>
      </div>
      <div class="list-view">
        <div class="table">
@@ -52,8 +52,7 @@
                    <i class="el-icon-refresh-left"></i>
                    <span>历史</span>
                  </span>
                  <span @click="handleAddGoods(scope.row)" class="margin_left_5px;" style="cursor:pointer;"
                  >
                  <span @click="handleAddGoods(scope.row)" class="margin_left_5px;" style="cursor: pointer">
                    <i class="el-icon-refresh"></i>
                    <span>补货</span>
                  </span>
@@ -149,7 +148,7 @@
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title,
      searchStr: this.$route.params.name ?? ''
      searchStr: this.$route.params.name ?? ""
    }
  },
  created() {
@@ -221,7 +220,7 @@
          prop: "cost",
          default: false,
          isShowColumn: showcol.includes("单位成本"),
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "总价值",
@@ -229,7 +228,7 @@
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "￥",
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "在库",
@@ -237,7 +236,7 @@
          default: true,
          isShowColumn: true,
          unit: "",
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "可用库存",
@@ -245,7 +244,7 @@
          default: true,
          isShowColumn: true,
          unit: "",
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "入库",
@@ -253,7 +252,7 @@
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: "",
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "出库",
@@ -261,7 +260,7 @@
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: "",
          textAlign:"right"
          textAlign: "right"
        },
        {
          label: "预测",
@@ -285,11 +284,7 @@
    },
    getList(val) {
      this.searchStr = val
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
@@ -313,10 +308,10 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          keyWord:row.productType,
          produceId:row.produceId,
          unit:row.unit,
          productName:row.productName,
          keyWord: row.productType,
          produceId: row.produceId,
          unit: row.unit,
          productName: row.productName,
          name: "报表"
        }
      })
@@ -327,19 +322,19 @@
      this.$router.push({
        name: "orderPoint",
        params: {
          productId:row.produceId,
          productId: row.produceId
        }
      })
    },
    // 位置
    handleLocation(row) {
      this.$router.push({
        name:"locationReport",
        params:{
        name: "locationReport",
        params: {
          // keyWord:row.row.productName,
          wareHouseCode:this.warehouseListName,
          productId:row.row.produceId,
          name:"库存报表"
          wareHouseCode: this.warehouseListName,
          productId: row.row.produceId,
          name: "库存报表"
        }
      })
    },
@@ -422,7 +417,7 @@
  .con_left {
    width: 200px;
    .el-checkbox-group {
      width:100%;
      width: 100%;
      display: flex;
      flex-direction: column;
    }
@@ -448,5 +443,4 @@
    white-space: pre-wrap !important;
  }
}

</style>