diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 66662c4b..dbc696f3 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -517,93 +517,93 @@ this.managementList = res.list; var params = this.setParams(); let that =this - // purchaseReceiptJobSubmit(params).then(res => { - // if (res.data) { - // let isCheckPrint = getSwitchInfoByCode(this.switchCode) - // if (!isCheckPrint) { - // uni.hideLoading() - - // // this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number) - // uni.redirectTo({ - // url: '/pages/pointPutawayJob/index?number='+that.jobContent.number - // }) - // } else { - // // if (res.data == '打印任务已发送,等待打印机处理!') { - // // this.showCommitSuccessMessage(res.data) - // // const purchaseReceiptDetailPointParams = { - // // printDeafult: this.printDeafult, - // // templateDeafult: this.templateDeafult, - // // } - // // uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams) - // // } else { - // // this.showErrorMessage(res.data) - // // } - // uni.showLoading({ - // title: "提交成功,将跳转到打印页面", - // mask: true - // }); - - // // 获取上架任务 - // let timerCount = 0 - // const timer1 = setInterval(async () => { - // if (timerCount == 15) { - // clearInterval(timer1) - // this.showErrorMessage("上架任务生成异常,请到收货记录里重新生成上架申请") - // return; - // } - // await getPutawayJobList({ - // filters: [{ - // column: "purchaseReceiptRecordNumber", - // action: "in", - // value: res.data.number - // }], - // pageNo: 1, - // pageSize: 1000, - // }).then(res1 => { - // timerCount = timerCount + 1 - // if (res1.data && res1.data.list && res1 - // .data - // .list.length && (res1.data.total >= res - // .data.detailCount)) { - // uni.hideLoading() - // clearInterval(timer1) - // const dataParams = { - // 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.hideLoading() - // uni.redirectTo({ - // url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' + - // encodeURIComponent(JSON.stringify(dataParams)) - // }) - // } - // }) - // }, 2000) - - // } - - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.$refs.comMessage.showErrorMessage(error, res => { - // if (res) { - // navigateBack(1) - // } - // }); - // }) + purchaseReceiptJobSubmit(params).then(res => { + if (res.data) { + let isCheckPrint = getSwitchInfoByCode(this.switchCode) + if (!isCheckPrint) { + uni.hideLoading() + + // this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number) + uni.redirectTo({ + url: '/pages/pointPutawayJob/index?number='+that.jobContent.number + }) + } else { + // if (res.data == '打印任务已发送,等待打印机处理!') { + // this.showCommitSuccessMessage(res.data) + // const purchaseReceiptDetailPointParams = { + // printDeafult: this.printDeafult, + // templateDeafult: this.templateDeafult, + // } + // uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams) + // } else { + // this.showErrorMessage(res.data) + // } + uni.showLoading({ + title: "提交成功,将跳转到打印页面", + mask: true + }); + + // 获取上架任务 + let timerCount = 0 + const timer1 = setInterval(async () => { + if (timerCount == 15) { + clearInterval(timer1) + this.showErrorMessage("上架任务生成异常,请到收货记录里重新生成上架申请") + return; + } + await getPutawayJobList({ + filters: [{ + column: "purchaseReceiptRecordNumber", + action: "in", + value: res.data.number + }], + pageNo: 1, + pageSize: 1000, + }).then(res1 => { + timerCount = timerCount + 1 + if (res1.data && res1.data.list && res1 + .data + .list.length && (res1.data.total >= res + .data.detailCount)) { + uni.hideLoading() + clearInterval(timer1) + const dataParams = { + 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.hideLoading() + uni.redirectTo({ + url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' + + encodeURIComponent(JSON.stringify(dataParams)) + }) + } + }) + }, 2000) + + } + + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.$refs.comMessage.showErrorMessage(error, res => { + if (res) { + navigateBack(1) + } + }); + }) } else { uni.hideLoading(); this.showErrorMessage(res.message);