From 7eb332b94fcc4d06000c38dda3ef49ca3b35f7c2 Mon Sep 17 00:00:00 2001 From: zzq <a13193816592@163.com> Date: 星期三, 27 九月 2023 20:54:35 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS --- src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue index cb0de4a..10bb66e 100644 --- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue +++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue @@ -1,12 +1,7 @@ <template> <div class="rightContent"> <div class="top"> - <SearchCommonView - :show-add="false" - :placeholder="'璇疯緭鍏ュ崟鍙�/浜у搧'" - :amount-view="false" - @searchClick="getList" - /> + <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ュ崟鍙�'" :amount-view="false" @searchClick="getList" /> </div> <div class="list-view"> <div class="table"> @@ -21,7 +16,7 @@ <script> import pageMixin from "@/components/makepager/pager/mixin/pageMixin" -import { getAllList } from "@/api/overview/overview" +import { historyInventoryAdjustment } from "@/api/operate/inventoryAdjustment" export default { name: "InventoryAdjustmentHistory", @@ -34,11 +29,15 @@ tableList: {}, showcol: ["鐘舵��"], searchOptions: [], - keyword: "" + keyword: "", + locationId: 0, + productId: "" } }, created() { this.setTable() + this.locationId = this.$route.params.locationId + this.productId = this.$route.params.productId this.getData() }, methods: { @@ -65,8 +64,7 @@ label: "鏃ユ湡", prop: "operationDate", isShowColumn: true, - default: true, - date: true + default: true }, { label: "鍗曞彿", @@ -129,18 +127,22 @@ }, // 璇锋眰鏁版嵁 async getData() { - await getAllList({ - number: this.keyword, + await historyInventoryAdjustment({ + locationId: this.locationId, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize, - sourceNumber: this.keyword + productId: this.productId }).then((res) => { if (res.code === 200) { const list = res.data.map((item) => { + let product = item.details[0].product return { ...item, from: item.fromLocation.name, - to: item.toLocation.name + to: item.toLocation.name, + productName: product.name, + amount: product.amount, + unit: product.unit } }) this.tableList.tableInfomation = list || [] -- Gitblit v1.8.0