diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue index b161d195..6e1963d4 100644 --- a/src/mycomponents/recommend/recommend.vue +++ b/src/mycomponents/recommend/recommend.vue @@ -3,8 +3,8 @@ - - + diff --git a/src/pages/inspect/job/inspectDetail.vue b/src/pages/inspect/job/inspectDetail.vue index 7be5a0f8..54b85aae 100644 --- a/src/pages/inspect/job/inspectDetail.vue +++ b/src/pages/inspect/job/inspectDetail.vue @@ -374,12 +374,12 @@ uni.hideLoading() if (res.data) { this.showCommitSuccessMessage("提交成功
生成到货检验记录
" + res.data) - createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) - }).catch(error => { - uni.hideLoading(); - this.showErrorMessage(error); - }) + // createPutAwayRequest(res.data).then(putawayres => { + // this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + // }).catch(error => { + // uni.hideLoading(); + // this.showErrorMessage(error); + // }) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/inspect/job/inspectFullDetail.vue b/src/pages/inspect/job/inspectFullDetail.vue index 2373ccfa..94ecd79b 100644 --- a/src/pages/inspect/job/inspectFullDetail.vue +++ b/src/pages/inspect/job/inspectFullDetail.vue @@ -394,12 +394,12 @@ if (res.data) { this.showCommitSuccessMessage("提交成功
生成到货检验记录" + res.data) //创建完检验记录后创建上架申请 - createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) - }).catch(error => { - uni.hideLoading(); - this.showErrorMessage(error); - }) + // createPutAwayRequest(res.data).then(putawayres => { + // this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + // }).catch(error => { + // uni.hideLoading(); + // this.showErrorMessage(error); + // }) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/inspect/job/inspectResult.vue b/src/pages/inspect/job/inspectResult.vue index ff2988bb..c7556747 100644 --- a/src/pages/inspect/job/inspectResult.vue +++ b/src/pages/inspect/job/inspectResult.vue @@ -546,12 +546,15 @@ hint = "提交成功
生成到货检验任务
" + res.data } else { hint = "提交成功
生成到货检验记录
" + res.data - createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) - }).catch(error => { - uni.hideLoading(); - this.showErrorMessage(error); - }) + //全都合格创建上架申请 + // if (this.jobContent.nextAction == "ALL_OK") { + // createPutAwayRequest(res.data).then(putawayres => { + // this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + // }).catch(error => { + // uni.hideLoading(); + // this.showErrorMessage(error); + // }) + // } } this.showCommitSuccessMessage(hint) } else { diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 976626d7..8570d820 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -247,8 +247,8 @@ try { var supplierCode = result.label.supplierCode; if (supplierCode == '' || supplierCode == undefined) { - this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") - return; + // this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") + // return; } var packingNumber = result.balance.packingNumber; var batch = result.balance.batch; diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 8fcd6aa0..4ab3be37 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -188,8 +188,8 @@ that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); // that.jobContent.toLocationTypeList = that.toLocationTypeList; that.subList = res.data.subList; - that.subList[0].containerNumber = "CN-00000001"; - that.subList[1].containerNumber = "CN-00000001"; + // that.subList[0].containerNumber = "CN-00000001"; + // that.subList[1].containerNumber = "CN-00000001"; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getDataSource(that.subList)