diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 038f9da7e..c5065f5ff 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -959,22 +959,52 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - - await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(',')) - .then((res) => { +let array = []//存储可采购数据 + let array1 = []//存储可制造数据 + let packingNumbers = [] + val.forEach((item,index) => { + packingNumbers.push(item.number) + + if (item.itemType == '可采购') { + array.push(item) + } + if (item.itemType == '可制造') { + array1.push(item) + } + }) + if (array.length>0) { + await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => { console.log(res) - if (labelType.value == 'cg') { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - window.open(src.value + '&asn_number=' + res) - } else { - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value + '&asn_number=' + res) - } + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') }) - .catch((err) => { + } + if (array1.length > 0) { + await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value + '&asn_number=' + res) + }).catch(err => { console.log(err) message.error('创建标签失败') }) + } + // await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(',')) + // .then((res) => { + // console.log(res) + // if (labelType.value == 'cg') { + // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + // window.open(src.value + '&asn_number=' + res) + // } else { + // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + // window.open(src.value + '&asn_number=' + res) + // } + // }) + // .catch((err) => { + // console.log(err) + // message.error('创建标签失败') + // }) } const getDefaultWorkshopCode = async () => { const data = await ConfigApi.getConfigPage({