diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue index 2f624835..4a008109 100644 --- a/src/mycomponents/detail/comDetailCard.vue +++ b/src/mycomponents/detail/comDetailCard.vue @@ -13,7 +13,7 @@ - + @@ -67,6 +67,10 @@ type: Boolean, default: true }, + isShowFromLocation: { + type: Boolean, + default: true + }, isShowToLocation: { type: Boolean, default: false diff --git a/src/pages/productReceipt/record/recordList.vue b/src/pages/productReceipt/record/recordList.vue index fd1221a6..831613b1 100644 --- a/src/pages/productReceipt/record/recordList.vue +++ b/src/pages/productReceipt/record/recordList.vue @@ -181,8 +181,13 @@ value: this.filterItemCode }) } - } + + filterParams.push({ + column: "type", + action: "like", + value: "scrap" + }) return filterParams; diff --git a/src/pages/productReceipt/record/recordListDetail.vue b/src/pages/productReceipt/record/recordListDetail.vue index a1cf6464..297f44a1 100644 --- a/src/pages/productReceipt/record/recordListDetail.vue +++ b/src/pages/productReceipt/record/recordListDetail.vue @@ -22,7 +22,9 @@ @@ -154,12 +156,6 @@ if (res.data.list.length > 0) { that.recordContent = res.data.list[0]; that.subList = res.data.list; - that.subList.forEach(item => { - item.batch = item.toBatch; - item.packingNumber = item.toPackingNumber; - item.inventoryStatus= item.fromInventoryStatus - item.toInventoryStatus =item.toInventoryStatus - }) that.detailSource = getDataSource(that.subList) } else { that.showMessage('列表数据为0');