diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index e4373597..b48480eb 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -1269,6 +1269,9 @@ export default { if (data.udi) { resultParts.push("层级标识: " + data.udi); } + if (data.cpmctymc) { + resultParts.push( data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc); + } if (data.batchNo) { resultParts.push("批次号: " + data.batchNo); } @@ -1281,6 +1284,25 @@ export default { if (data.serialNo) { resultParts.push("序列号: " + data.serialNo); } + if (data.productType == 2){ + if (data.bzgg) { + resultParts.push("包装规格: " + data.bzgg); + } + }else { + if (data.ggxh) { + resultParts.push("规格型号: " + data.ggxh); + } + } + if (data.prepnSpec) { + resultParts.push("制剂规格: " + data.prepnSpec); + } + if (data.prepnUnit) { + resultParts.push("剂型: " + data.prepnUnit); + } + if (data.packUnit) { + resultParts.push("计量单位: " + data.packUnit); + } + this.scanTitle = "扫码结果:" + data.code; this.result = resultParts.join(" , "); if (message == 'success') {