|
|
|
@ -769,24 +769,23 @@ export default {
|
|
|
|
|
let query = {}; |
|
|
|
|
query.marketId = this.queryOwn.marketId; |
|
|
|
|
query.materialId = this.queryOwn.materialId; |
|
|
|
|
query.stockListId = this.$route.query.id; |
|
|
|
|
console.log('tianjian ', query); |
|
|
|
|
let b = await getListStock(page.currentPage, page.pageSize, Object.assign(params, query)); |
|
|
|
|
this.data1 = b.data.data.records; |
|
|
|
|
console.log('出库明细>>>>', this.data1); |
|
|
|
|
this.data1.forEach(i => { |
|
|
|
|
if (i.outboundType == '1') { |
|
|
|
|
if (i.outboundType == 1) { |
|
|
|
|
i.outboundTypeName = '商配'; |
|
|
|
|
} |
|
|
|
|
if (i.outboundType == '2') { |
|
|
|
|
if (i.outboundType == 2) { |
|
|
|
|
i.outboundTypeName = '市配'; |
|
|
|
|
} |
|
|
|
|
if (i.outboundType == '3') { |
|
|
|
|
if (i.outboundType == 3) { |
|
|
|
|
i.outboundTypeName = '自提'; |
|
|
|
|
} |
|
|
|
|
if (i.deliveryListCode == '-1') { |
|
|
|
|
i.deliveryListCode = null; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
console.log("处理的数据》》》",this.data1); |
|
|
|
|
this.page1.total = b.data.data.total; |
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
@ -819,6 +818,7 @@ export default {
|
|
|
|
|
this.query.serviceType = this.queryOwn.serviceType; |
|
|
|
|
this.query.materialId = this.queryOwn.materialId; |
|
|
|
|
this.query.warehouseId = this.queryOwn.warehouseId; |
|
|
|
|
this.query.incomingBatch = this.$route.query.incomingBatch; |
|
|
|
|
this.query.storeId = |
|
|
|
|
!!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null; |
|
|
|
|
console.log('库存品参数<><><><', this.query); |
|
|
|
|