diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index b5387eb5..8c2b29cc 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -17,7 +17,7 @@ 来源库位 - + diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index bf07eb15..3a7bf0f3 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -430,10 +430,14 @@ const remove = (record, index) => { } const packGetFocus = () => { - comscan.value.getfocus() + if (comscan.value) { + comscan.value.getfocus() + } } const packLoseFocus = () => { - comscan.value.losefocus() + if (comscan.value) { + comscan.value.losefocus() + } } const showMessage = (message, callback) => { setTimeout((r) => { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index d3b468ac..8103d1fa 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -340,7 +340,7 @@ const getScanResult = (result) => { if (list.length > 1) { jobListRef.value.openList(list) } else { - selectItem(list[0], scanMessage) + selectItem(list[0]) } } else { showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 2733ad8b..67996d56 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -332,7 +332,7 @@ const print = () => { printTimes: getCurrDateTime() // 打印时间 }) }) - uni.navigateTo({ + uni.redirectTo({ url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` }) }) @@ -360,7 +360,7 @@ const getH5BatchPrintingLable = (number) => { token: storage.getStorage(storage.constant.token), asn_number: resLable.data } - uni.navigateTo({ + uni.redirectTo({ url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` }) }) diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 681776bf..66c1ca52 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -351,33 +351,21 @@ const showMessageHint = (hint, callback) => { const submitJob = () => { proxy.$modal.loading('提交中....') const itemCodes = [] - detailSource.value.forEach((item) => { - itemCodes.push(item.itemCode) - }) - - getManagementPrecisions(itemCodes, toLocationCode.value, (res) => { - if (res.success) { - managementList.value = res.list - const params = setParams() - - productionReceiptJobSubmit(params) - .then((res) => { - uni.hideLoading() - if (res.data) { - showCommitSuccessMessage(`提交成功
生成发料接收记录
${res.data}`) - } else { - showErrorMessage(`提交失败[${res.msg}]`) - } - }) - .catch((error) => { - uni.hideLoading() - showErrorMessage(error) - }) - } else { + const params = setParams() + console.log('提交参数', JSON.stringify(params)) + productionReceiptJobSubmit(params) + .then((res) => { uni.hideLoading() - showErrorMessage(res.message) - } - }) + if (res.data) { + showCommitSuccessMessage(`提交成功
生成发料接收记录
${res.data}`) + } else { + showErrorMessage(`提交失败[${res.msg}]`) + } + }) + .catch((error) => { + uni.hideLoading() + showErrorMessage(error) + }) } const setParams = () => { const subList = [] @@ -386,9 +374,9 @@ const setParams = () => { detailSource.value.forEach((item) => { item.subList.forEach((detail) => { if (detail.scaned) { - const info = getPackingNumberAndBatch(managementList.value, detail.itemCode, detail.packingNumber, detail.batch) - detail.toPackingNumber = info.packingNumber - detail.toBatch = info.batch + // const info = getPackingNumberAndBatch(managementList.value, detail.itemCode, detail.packingNumber, detail.batch) + detail.toPackingNumber = detail.packingNumber + detail.toBatch = detail.batch detail.toContainerNumber = '' detail.toLocationCode = toLocationCode.value subList.push(detail) diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 1e3700c1..6396054a 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -275,6 +275,10 @@ const selectItem = (item) => { } const getScanResult = (result) => { + if (result.scanMessage.indexOf('ASN') > -1) { + showMessage('请扫描箱标签') + return + } try { let filters = [] if (result.label.barType == 'BarCode') {