diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index ea3d0a3c..a8db0f91 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -276,10 +276,15 @@ const getScanResult = (result) => { try { scanMessage.value = '' const filters = [ + // { + // column: 'packingNumber', + // action: '==', + // value: result.label.packingNumber + // }, { - column: 'packingNumber', - action: '==', - value: result.label.packingNumber + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber }, { column: 'batch', diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue index 0e3e96d8..8f9ee940 100644 --- a/src/pages/productReceipt/job/ccProductReceiptJob.vue +++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue @@ -311,11 +311,16 @@ try { scanMessage.value = "" const filters = [ - { - column: 'packingNumber', - action: '==', - value: result.label.packingNumber - }, + // { + // column: 'packingNumber', + // action: '==', + // value: result.label.packingNumber + // }, + { + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber + }, { column: 'batch', action: '==', diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index d14b6db5..97c5de98 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -153,15 +153,15 @@ const getList = (type) => { const openJobDetail = (item, scanMessage = '') => { if (props.type == 'predict') { uni.navigateTo({ - url: `./productReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}` + url: `./productReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}` }) } else if (props.type == 'assemble') { uni.navigateTo({ - url: `./fgProductReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}` + url: `./fgProductReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}}` }) } else { uni.navigateTo({ - url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}` + url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}}` }) } scanMessage.value = '' @@ -293,9 +293,9 @@ const getScanResult = (result) => { scanMessage.value = '' const filters = [ { - column: 'packingNumber', - action: '==', - value: result.label.packingNumber + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber }, { column: 'batch', diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 679aae47..66ac1efa 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -320,9 +320,9 @@ const getScanResult = (result) => { } else { filters = [ { - column: 'packingNumber', - action: '==', - value: result.label.packingNumber + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber }, { column: 'batch', diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 6aca2f8b..b2ab8586 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -26,7 +26,7 @@ import { getPutawayJobList, cancleTakePutawayJob } from '@/api/request2.js' import { goHome, updateTitle } from '@/common/basic.js' import { getDetailOption, getDetailGiveupOption } from '@/common/array.js' - +import {Exception} from 'sass'; import comEmptyView from '@/mycomponents/common/comEmptyView.vue' import jobFilter from '@/mycomponents/job/jobFilter.vue' import comPutawayJobCard from '@/pages/putaway/coms/comPutawayJobCard.vue' @@ -285,14 +285,14 @@ const getScanResult = (result) => { try { const filters = [ { - column: 'packingNumber', - action: '==', - value: result.label.packingNumber + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber }, { column: 'batch', action: '==', - value: result.label.batch + value: result.package.batch }, // { // column: 'qty', @@ -302,12 +302,12 @@ const getScanResult = (result) => { { column: 'itemCode', action: '==', - value: result.label.itemCode + value: result.package.itemCode }, { column: 'status', action: 'in', - value: '1,2,3' + value: '1,2' } // { // column: 'accept_user_id',