From c356ebfc46d6f98afb6eebc252db2db6718e25f2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:58:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/reportForm/inboundOutboundDetail/index.vue | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 46a21b5..55058e2 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -31,7 +31,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getHistory } from "@/api/reportForm/inventoryRwport"
-import { getProductOperatonList } from "@/api/product/product"
+// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -168,7 +168,10 @@
async getData() {
if (this.params.name === "鎶ヨ〃") {
await getHistory({
- productId: this.params.id,
+ keyWord:this.params.keyWord,
+ produceId:this.params.produceId,
+ unit:this.params.unit,
+ productName:this.params.productName,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -178,23 +181,32 @@
}
})
} else {
- await getProductOperatonList({
- productId: this.params.id,
+ // await getProductOperatonList({
+ // productId: this.params.id,
+ // page: this.pagerOptions.currPage,
+ // pageSize: this.pagerOptions.pageSize
+ // }).then((res) => {
+ // if (res.code === 200) {
+ // const list = res.data.map((item) => {
+ // return {
+ // ...item,
+ // fromLocation: item.fromLocation.name,
+ // toLocation: item.toLocation.name,
+ // productName: this.params.name,
+ // amount: item.details[0].product.amount,
+ // unit: item.details[0].product.unit
+ // }
+ // })
+ // this.tableList.tableInfomation = list || []
+ // this.pagerOptions.totalCount = res.total
+ // }
+ // })
+ await getHistory({
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
- const list = res.data.map((item) => {
- return {
- ...item,
- fromLocation: item.fromLocation.name,
- toLocation: item.toLocation.name,
- productName: this.params.name,
- amount: item.details[0].product.amount,
- unit: item.details[0].product.unit
- }
- })
- this.tableList.tableInfomation = list || []
+ this.tableList.tableInfomation = res.data
this.pagerOptions.totalCount = res.total
}
})
--
Gitblit v1.8.0