From 9b104639e51ab027939ec3f5d0686aa1f92e10ea Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 23 Sep 2024 09:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/PanelCreateCodeDetail.vue | 7 +++----
 src/views/collect/PanelCreateCodes.vue      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/PanelCreateCodeDetail.vue b/src/views/collect/PanelCreateCodeDetail.vue
index ceae0e15..c8695718 100644
--- a/src/views/collect/PanelCreateCodeDetail.vue
+++ b/src/views/collect/PanelCreateCodeDetail.vue
@@ -13,6 +13,9 @@
       <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="batchNo" show-overflow-tooltip></el-table-column>
+      <el-table-column width="100" label="计量单位" prop="measname"></el-table-column>
+      <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
+      <el-table-column label="扫码数量" width="80" prop="count" 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>
@@ -23,10 +26,6 @@
           <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>
-      <el-table-column width="100" label="计量单位" prop="measname">
-      </el-table-column>
       <el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
 
diff --git a/src/views/collect/PanelCreateCodes.vue b/src/views/collect/PanelCreateCodes.vue
index 96b3808c..c86a77b0 100644
--- a/src/views/collect/PanelCreateCodes.vue
+++ b/src/views/collect/PanelCreateCodes.vue
@@ -22,7 +22,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="规格型号"
+        label="规格"
         prop="ggxh"
         width="160"
         show-overflow-tooltip