|
@@ -169,7 +169,6 @@ export default {
|
|
|
columns: [],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
- console.log(this.warehouseCascadeData, this.grabFlag)
|
|
|
this.disabled = true
|
|
|
// 抓单时
|
|
|
if (this.grabFlag == 1) {
|
|
@@ -180,22 +179,28 @@ export default {
|
|
|
this.queryParam.salePriceType = this.priceType
|
|
|
}
|
|
|
return fun[this.grabFlag](Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ console.log(res)
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
+ console.log(data, this.grabFlag)
|
|
|
// 不抓单
|
|
|
if (this.grabFlag == 0) {
|
|
|
+ console.log(this.warehouseCascadeData, data)
|
|
|
data.list[i].putCost = data.list[i].lastStockCost
|
|
|
const warehouse = this.warehouseCascadeData.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
|
|
|
- const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
|
|
|
- // const warehouse = this.warehouseCascadeData[0].warehouseLocationList[0]
|
|
|
- console.log(warehouse, '仓库sn', warehouseLocation, '仓位sn')
|
|
|
- data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
|
|
|
+ if (warehouse) {
|
|
|
+ const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
|
|
|
+ if (warehouseLocation) {
|
|
|
+ data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
|
|
|
+ }
|
|
|
+ }
|
|
|
data.list[i].returnQty = 1
|
|
|
data.list[i].celQty = 0
|
|
|
+ console.log(data)
|
|
|
} else {
|
|
|
// 抓单
|
|
|
data.list[i].returnQty = data.list[i].qty - data.list[i].hasReturnQty
|
|
@@ -210,6 +215,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.listData = data.list || []
|
|
|
+ console.log(this.listData)
|
|
|
this.disabled = false
|
|
|
}
|
|
|
return data
|