From 7174a1eb03a40ada201ac2115a14686d5f859f1b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 6 Dec 2024 10:41:25 +0800
Subject: [PATCH] =?UTF-8?q?12/6=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=88=90=E5=8A=9F=E5=90=8E=20=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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') {