diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue index 28cb3a00..097b2fbb 100644 --- a/src/pages/pointProductReceipt/index.vue +++ b/src/pages/pointProductReceipt/index.vue @@ -12,8 +12,8 @@ {{item.itemName}} - 物料描述 - {{item.itemDesc1}} + 包装名称 + {{item.packName}} 包装号 @@ -37,8 +37,8 @@ {{item.batch}} - 班次 - {{item.shiftCode}} + 物料类型 + {{item.itemType}} 打印时间 @@ -117,20 +117,20 @@
${item.itemName}
- 物料描述 - {{item.itemDesc1}} + 包装名称 + ${item.packName} 包装号 - {{item.relateNumber}} + ${item.relateNumber} 生产线 - {{item.productionLineCode}} + ${item.productionLineCode} 数量 - {{item.qty}} + ${item.qty}
@@ -139,15 +139,15 @@
批次 - {{item.batch}} + ${item.batch} - 班次 - {{item.shiftCode}} + 物料类型 + ${item.itemType} 打印时间 - {{item.printTimes}} + ${item.printTimes} ` diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 4c7e6113..51cca9c7 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -70,6 +70,7 @@ import { getManagementPrecisions } from '@/common/balance.js'; + import { getCurrDateTime} from '@/common/basic.js'; import { getProductReceiptJobDetail, @@ -377,19 +378,19 @@ console.log('打印', res) let pointData = [] res.data.forEach(item => { - pointData.push({ - barcodeString: item.barcodeString, //标签 - itemCode: item.itemCode || '', //物品代码 + pointData.push({ + barcodeString: item.barcodeString, //标签 + itemCode: item.itemCode || '', //物品代码 itemName: item.itemName || '', //物品名称 packName: item.packName || '', //包装名称 - itemType: item.itemType || '', //物料类型 - itemDesc1: item.itemDesc1 || '', //物品描述 - relateNumber: item.relateNumber || '', //relateNumber包装号 - batch: item.batch || '', //批次 - productionLineCode: item.productionLineCode || '', //生产线 - shiftCode: item.shiftCode || '', //班次 - qty: item.qty || '', //数量 - printTimes: item.printTimes || '' //打印时间 + itemType: item.itemType || '', //物料类型 + itemDesc1: item.itemDesc1 || '', //物品描述 + relateNumber: item.relateNumber || '', //relateNumber包装号 + batch: item.batch || '', //批次 + productionLineCode: item.productionLineCode || '', //生产线 + shiftCode: item.shiftCode || '', //班次 + qty: item.qty || '', //数量 + printTimes: getCurrDateTime() //打印时间 }) }) console.log('pointData', pointData)