diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index db4dca9ab..896a97932 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -254,17 +254,43 @@ const formsSuccess = async (formType,data) => { getList() } // 标签打印 +// const handlePoint = async (row) => { +// console.log(row,66666666666); +// +// // 判断是采购还是制造 +// if (row.asnNumber !== null && row.asnNumber !== '') { +// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) +// window.open(src.value+'&asn_number='+row.id) +// } else { +// const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) +// window.open(src.value+'&asn_number='+row.id) +// } +// } +const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { - console.log(row,66666666666); - - // 判断是采购还是制造 - if (row.asnNumber !== null && row.asnNumber !== '') { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+row.id) - } else { - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+row.id) - } + console.log(row.packingNumber,445555555555555); + PackageApi.getBalanceToPackage(row.number).then(res => { + console.log(777,res); + if (res.productionLineCode != null) { + labelType.value = 'zz' + } else { + labelType.value = 'cg' + } + PackageApi.batchPrintingLable((res.number)).then((resLable) =>{ + console.log(159,resLable ) + // 判断是采购还是制造 + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + console.log(159,resLable ) + window.open(src.value+'&asn_number='+resLable) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+resLable) + } + }) + }).catch(err => { + console.log(err) + }) } /** 导入 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index f9141c776..cfe7db9a5 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -88,32 +88,37 @@ const buttonTableClick = async (val, row) => { handlePoint(row) } } + +const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const handlePoint = async (row) => { // 查询是否已创建过标签 - let labelType = '' await PackageApi.getPackagePage({ requestNumber: row.number }).then((res) => { if(res.list.length > 0) { if (res.list[0].productionLineCode != null) { - labelType = 'zz' + labelType.value = 'zz' } else { - labelType = 'cg' + labelType.value = 'cg' } + PackageApi.batchPrintingLable(res.list.map(item1=>item1.number).join(',')).then((resLable) =>{ + console.log(159,resLable ) + + // 判断是采购还是制造 + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+resLable) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+resLable) + } + }) } }).catch(err => { console.log(err) }) - const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL - // 判断是采购还是制造 - if (labelType == 'cg') { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+row.number) - } else { - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+row.number) - } } // 头部按钮事件 const buttonBaseClick = (val, item) => {