zuozhengqing
2023-11-13 f16c444ad4d0478fa73c7005d7e94b551963769b
Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
3个文件已修改
35 ■■■■■ 已修改文件
src/views/operate/orderPoint/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/product/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/inventoryReport/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/orderPoint/index.vue
@@ -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
@@ -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() {
@@ -285,11 +284,7 @@
    },
    getList(val) {
      this.searchStr = val
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
@@ -327,7 +322,7 @@
      this.$router.push({
        name: "orderPoint",
        params: {
          productId:row.produceId,
          productId: row.produceId
        }
      })
    },
@@ -448,5 +443,4 @@
    white-space: pre-wrap !important;
  }
}
</style>