diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index d0bc30b50..43f32ad4a 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -364,8 +364,15 @@ const handlePoint = async (row) => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+res.zzLabel) + PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => { + console.log(res) + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + // window.open(src.value+'&asn_number='+res.zzLabel) } if (res.cgLabel) { //采购标签 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 483e8fb4f..b298c5ab3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -624,19 +624,19 @@ const buttonTableClick = async (val, row) => { return } }) - ruleApi.getManagementPrecision({ + ruleApi.getManagementPrecision({ itemCodes: [item['itemCode']], locationCode: item.toLocationCode }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision - if ( toManagementPrecision.value == 'BY_BATCH') { + }) + if ( toManagementPrecision.value == 'BY_BATCH') { // row['fromBatchFormItemType'] = 'FormDate' - item['disabled_batch'] = true - } else if(toManagementPrecision.value == 'BY_QUANTITY') { + row['disabled_batch'] = false + } else { // row['fromBatchFormItemType'] = '' - item['disabled_batch'] = false + row['disabled_batch'] = true } - }) }) } else if (val == 'mainHandle') { // 处理