From 5080a94396261edc8446f906c4f1701999925f04 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 21 Oct 2024 14:23:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inoutDrug/PanelCreateOrderCodesDrug.vue   | 25 ++++++++++---------
 .../inoutDrug/PanelCreateOrderDetailDrug.vue  |  7 +++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/inoutDrug/PanelCreateOrderCodesDrug.vue b/src/views/inoutDrug/PanelCreateOrderCodesDrug.vue
index de485a90..a062d348 100644
--- a/src/views/inoutDrug/PanelCreateOrderCodesDrug.vue
+++ b/src/views/inoutDrug/PanelCreateOrderCodesDrug.vue
@@ -45,18 +45,6 @@
         width="140"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
-        label="制剂单位"
-        prop="prepnUnit"
-        width="140"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="价格"
-        prop="price"
-        width="120"
-        show-overflow-tooltip
-      ></el-table-column>
       <el-table-column
         label="扫码数量"
         prop="count"
@@ -69,6 +57,12 @@
         width="80"
         show-overflow-tooltip
       ></el-table-column>
+<!--      <el-table-column-->
+<!--        label="制剂单位"-->
+<!--        prop="prepnUnit"-->
+<!--        width="140"-->
+<!--        show-overflow-tooltip-->
+<!--      ></el-table-column>-->
       <el-table-column
         label="生产日期"
         prop="produceDate"
@@ -88,6 +82,13 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="价格"
+        prop="price"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+
       <!--      <el-table-column-->
       <!--        label="供应商"-->
       <!--        prop="supName"-->
diff --git a/src/views/inoutDrug/PanelCreateOrderDetailDrug.vue b/src/views/inoutDrug/PanelCreateOrderDetailDrug.vue
index f6822bbd..4d066fa3 100644
--- a/src/views/inoutDrug/PanelCreateOrderDetailDrug.vue
+++ b/src/views/inoutDrug/PanelCreateOrderDetailDrug.vue
@@ -14,7 +14,8 @@
       <!--<el-table-column label="规格型号" width="140" prop="spec" show-overflow-tooltip></el-table-column>-->
       <el-table-column label="包装规格" width="140" prop="bzgg" show-overflow-tooltip></el-table-column>
       <el-table-column label="制剂规格" width="140" prop="prepnSpec" show-overflow-tooltip></el-table-column>
-      <el-table-column label="制剂单位" width="140" prop="prepnUnit" 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="80" prop="reCount" 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">
@@ -27,8 +28,8 @@
           <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 label="制剂单位" width="140" prop="prepnUnit" show-overflow-tooltip></el-table-column>-->
       <!--      <el-table-column width="120" label="价格"-->
       <!--                       v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2">-->
       <!--        <template slot-scope="scope">-->