From f16c444ad4d0478fa73c7005d7e94b551963769b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 13 十一月 2023 14:48:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/reportForm/inventoryReport/index.vue | 48 ++++++++++-------------
src/views/productManage/product/index.vue | 20 +++++++++-
src/views/operate/orderPoint/index.vue | 13 +++---
3 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/src/views/operate/orderPoint/index.vue b/src/views/operate/orderPoint/index.vue
index 0da0d1d..676f4a1 100644
--- a/src/views/operate/orderPoint/index.vue
+++ b/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 {
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index cf639f7..c270838 100644
--- a/src/views/productManage/product/index.vue
+++ b/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>
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index ec39be9..9198a5c 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/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>
--
Gitblit v1.8.0