From c0cf8e67b0d39b65f93677aba8cd91c7581f8850 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 19:37:59 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PanelCreateOrderCodeDetail.vue            | 14 ++++++-------
 .../distribution/PanelCreateOrderCodes.vue    | 20 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodeDetail.vue b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodeDetail.vue
index 9e21199..0646b0a 100644
--- a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodeDetail.vue
+++ b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodeDetail.vue
@@ -11,17 +11,17 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column label="药品名称" width="150" prop="coName" show-overflow-tooltip></el-table-column>
-      <el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column>
+      <el-table-column label="包装规格" width="150" prop="bzgg" show-overflow-tooltip></el-table-column>
       <el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>
       <el-table-column label="生产日期" width="120" prop="productDate" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ convertDateFun(scope.row.productDate) }}</span>
-        </template>
+        <!--<template slot-scope="scope">-->
+        <!--  <span>{{ convertDateFun(scope.row.productDate) }}</span>-->
+        <!--</template>-->
       </el-table-column>
       <el-table-column label="失效日期" width="120" prop="expireDate" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ convertDateFun(scope.row.expireDate) }}</span>
-        </template>
+        <!--<template slot-scope="scope">-->
+        <!--  <span>{{ convertDateFun(scope.row.expireDate) }}</span>-->
+        <!--</template>-->
       </el-table-column>
       <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
       <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
diff --git a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
index 035be5e..8d1b502 100644
--- a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
+++ b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
@@ -10,17 +10,35 @@
       </el-table-column>
       <el-table-column label="序号" type="index" width="55"></el-table-column>
       <el-table-column
-        label="UDI码"
+        label="追溯码"
         prop="code"
         width="280"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="药品通用名"
+        prop="productName"
+        width="160"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="批次号"
         prop="batchNo"
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="包装规格"
+        prop="bzgg"
+        width="140"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="制剂规格"
+        prop="prepnSpec"
+        width="140"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="价格"
         prop="price"