diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue index abade40..71273f3 100644 --- a/src/views/modules/recv/recv.vue +++ b/src/views/modules/recv/recv.vue @@ -600,7 +600,7 @@ export default { } else { printLabelType = 'BIL标签'; } - this.printViaServer(data.data,item.needCheck,printLabelType); // 调用打印 + this.printViaServer(data.data, item.needCheck, printLabelType, receiveData.site); // 使用本次接收站点打印 this.processFlag = 1; this.scanCode = ''; this.poList = []; @@ -619,7 +619,11 @@ export default { /** * 通过服务器打印 */ - async printViaServer(receiptNo,needCheck,printLabelType) { + async printViaServer(receiptNo, needCheck, printLabelType, site) { + if (!site || !receiptNo) { + this.$message.error('接收成功,但缺少接收站点或接收单号,无法打印标签') + return + } this.$emit('print-start') try { const printRequest = { @@ -631,6 +635,7 @@ export default { userId: localStorage.getItem('userName'), username: localStorage.getItem('userName'), site: localStorage.getItem('site'), + subSite: site, receiptNo: receiptNo, needCheck:needCheck, labelType:printLabelType @@ -638,6 +643,8 @@ export default { const { data } = await printLabel(printRequest) if (data.code === 200) { this.$message.success(`打印任务已发送!`) + } else { + this.$message.error(data.msg || '接收成功,但标签打印失败,请补打标签') } } catch (error) { console.error('服务器打印失败:', error)