|
|
@ -459,14 +459,15 @@ |
|
|
|
title: "提交成功,将跳转到打印页面", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
|
|
|
|
// 获取上架任务 |
|
|
|
let timerCount = 0 |
|
|
|
const timer1 = setInterval(async ()=>{ |
|
|
|
if(timerCount == 10){ |
|
|
|
if(timerCount == 15){ |
|
|
|
clearInterval(timer1) |
|
|
|
uni.showLoading({ |
|
|
|
uni.showToast({ |
|
|
|
title: "跳转打印页面失败", |
|
|
|
mask: true |
|
|
|
icon: "none" |
|
|
|
}); |
|
|
|
return; |
|
|
|
} |
|
|
@ -474,22 +475,21 @@ |
|
|
|
filters: [{ |
|
|
|
column: "purchaseReceiptRecordNumber", |
|
|
|
action: "in", |
|
|
|
value: res.data |
|
|
|
value: res.data.number |
|
|
|
}], |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 1000, |
|
|
|
}).then(res=>{ |
|
|
|
}).then(res1=>{ |
|
|
|
timerCount = timerCount + 1 |
|
|
|
console.log(11111) |
|
|
|
if(res.data && res.data.list&&res.data.list.length){ |
|
|
|
if(res1.data && res1.data.list&&res1.data.list.length&&(res1.data.total >= res.data.detailCount)){ |
|
|
|
uni.hideLoading() |
|
|
|
clearInterval(timer1) |
|
|
|
const dataParams = { |
|
|
|
toLocationCode: res.data.list[0].toLocationCode, |
|
|
|
number: res.data.list[0].number, |
|
|
|
creator: res.data.list[0].creator, |
|
|
|
createTime: res.data.list[0].createTime, |
|
|
|
ids : res.data.list.map(item=>item.masterId).join(',') |
|
|
|
toLocationCode: res1.data.list[0].toLocationCode, |
|
|
|
number: res1.data.list[0].number, |
|
|
|
creator: res1.data.list[0].creator, |
|
|
|
createTime: res1.data.list[0].createTime, |
|
|
|
ids : res1.data.list.map(item=>item.masterId).join(',') |
|
|
|
} |
|
|
|
console.log(dataParams) |
|
|
|
uni.navigateTo({ |
|
|
@ -497,7 +497,7 @@ |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
},1000) |
|
|
|
},2000) |
|
|
|
|
|
|
|
} else { |
|
|
|
this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
|