From c74dfb7c10d2fdb25d240bb764767cc2de015551 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Feb 2025 16:30:57 +0800
Subject: [PATCH] =?UTF-8?q?2/21=20=E7=95=8C=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

---
 src/views/collect/IoSplitFifoRemove.vue   | 27 ++++++++++++++++++-----
 src/views/collect/newCreateCodeDetail.vue |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index 8c6507ae..39b742a5 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -97,7 +97,7 @@
         </el-alert>
 
         <el-row :gutter="24" style="margin-top: 10px">
-          <el-col :span="12" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 15px;">
+          <el-col :span="12" style="border: 1px solid #e3dfe1; padding:15px; height: 400px; margin-left: 15px;">
             <h2 style="font-weight: bold;">当前上药队列</h2>
             <el-table
               :data="queueCodes"
@@ -134,7 +134,7 @@
               >
               </el-table-column>
               <el-table-column
-                prop="bzgg"
+                prop="prepnSpec"
                 label="制剂规格"
               >
               </el-table-column>
@@ -149,17 +149,17 @@
               >
               </el-table-column>
               <el-table-column
-                prop="serialNo"
+                prop="batchNo"
                 label="批次号"
               >
               </el-table-column>
               <el-table-column
-                prop="serialNo"
+                prop="produceDate"
                 label="生产日期"
               >
               </el-table-column>
               <el-table-column
-                prop="serialNo"
+                prop="expireDate"
                 label="失效日期"
               >
               </el-table-column>
@@ -176,7 +176,7 @@
             <!--</pagination>-->
 
           </el-col>
-          <el-col :span="11" style="border: 1px solid #e3dfe1; margin-left: 27px; padding: 15px;height: 700px;">
+          <el-col :span="11" style="border: 1px solid #e3dfe1; margin-left: 27px; padding: 15px;height: 400px;">
             <h2 style="font-weight: bold;">工位库存队列</h2>
             <!--<el-divider></el-divider>-->
             <!--<div style=" border-top: 1px solid #ccc;">-->
@@ -234,6 +234,21 @@
                 label="序列号"
               >
               </el-table-column>
+              <el-table-column
+                prop="batchNo"
+                label="批次号"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="produceDate"
+                label="生产日期"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="expireDate"
+                label="失效日期"
+              >
+              </el-table-column>
             </el-table>
             <!--<pagination-->
             <!--  v-show="splitCodeTotal>0"-->
diff --git a/src/views/collect/newCreateCodeDetail.vue b/src/views/collect/newCreateCodeDetail.vue
index 05e5b000..b701eaa9 100644
--- a/src/views/collect/newCreateCodeDetail.vue
+++ b/src/views/collect/newCreateCodeDetail.vue
@@ -24,7 +24,7 @@
         <h2 style="font-weight: bold;">扫码明细({{codeCount}})</h2>
         <!--<el-divider></el-divider>-->
         <div style=" border-top: 1px solid #ccc;">
-          <el-table v-loading="loading" :data="codeArray" style="width: 100%; margin-top: 20px" max-height="600px"
+          <el-table v-loading="loading" :data="codeArray" style="width: 100%; margin-top: 20px" max-height="280px"
                     ref="multipleTable">
             <!--      <el-table-column-->
             <!--        type="selection"-->