From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git
---
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 10bb66e..d1bbaa0 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -31,20 +31,23 @@
searchOptions: [],
keyword: "",
locationId: 0,
- productId: ""
+ productId: "",
+ baseOperationType: ""
}
},
created() {
this.setTable()
this.locationId = this.$route.params.locationId
this.productId = this.$route.params.productId
+ this.baseOperationType = this.$route.params.baseOperationType
this.getData()
},
methods: {
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -128,6 +131,7 @@
// 璇锋眰鏁版嵁
async getData() {
await historyInventoryAdjustment({
+ baseOperationType: this.baseOperationType,
locationId: this.locationId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
@@ -138,10 +142,10 @@
let product = item.details[0].product
return {
...item,
- from: item.fromLocation.name,
- to: item.toLocation.name,
+ from: item.details[0].fromLocation.jointName?item.details[0].fromLocation.jointName:"",
+ to: item.details[0].toLocation.jointName?item.details[0].toLocation.jointName:"",
productName: product.name,
- amount: product.amount,
+ amount: item.details[0].amount,
unit: product.unit
}
})
--
Gitblit v1.8.0