From 26ac8ac7cbaa94fece28bb5c3eb95d0d71a4cf37 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Feb 2025 16:14:29 +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   | 73 +++++++++++++++--------
 src/views/collect/newCreateCodeDetail.vue |  6 +-
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/views/collect/IoSplitFifoRemove.vue b/src/views/collect/IoSplitFifoRemove.vue
index 51d0af88..8c6507ae 100644
--- a/src/views/collect/IoSplitFifoRemove.vue
+++ b/src/views/collect/IoSplitFifoRemove.vue
@@ -123,14 +123,19 @@
                 <!--  </div>-->
                 <!--</template>-->
               </el-table-column>
+              <!--<el-table-column-->
+              <!--  prop="productName"-->
+              <!--  label="药品名称"-->
+              <!--&gt;-->
+              <!--</el-table-column>-->
               <el-table-column
-                prop="productName"
-                label="药品名称"
+                prop="nameCode"
+                label="产品标识"
               >
               </el-table-column>
               <el-table-column
-                prop="nameCode"
-                label="药品标识"
+                prop="bzgg"
+                label="制剂规格"
               >
               </el-table-column>
               <el-table-column
@@ -143,17 +148,32 @@
                 label="序列号"
               >
               </el-table-column>
+              <el-table-column
+                prop="serialNo"
+                label="批次号"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="serialNo"
+                label="生产日期"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="serialNo"
+                label="失效日期"
+              >
+              </el-table-column>
               <!-- 添加 id 列，设置为隐藏 -->
               <!--<el-table-column prop="id" label="ID" width="0" v-show="true"></el-table-column>-->
             </el-table>
-            <pagination
-              v-show="queueCodeTotal>0"
-              :total="queueCodeTotal"
-              :limit.sync="queueQuery.limit"
-              :page.sync="queueQuery.page"
-              @pagination="getCodes()"
-            >
-            </pagination>
+            <!--<pagination-->
+            <!--  v-show="queueCodeTotal>0"-->
+            <!--  :total="queueCodeTotal"-->
+            <!--  :limit.sync="queueQuery.limit"-->
+            <!--  :page.sync="queueQuery.page"-->
+            <!--  @pagination="getCodes()"-->
+            <!--&gt;-->
+            <!--</pagination>-->
 
           </el-col>
           <el-col :span="11" style="border: 1px solid #e3dfe1; margin-left: 27px; padding: 15px;height: 700px;">
@@ -189,14 +209,19 @@
                 width="180"
               >
               </el-table-column>
+              <!--<el-table-column-->
+              <!--  prop="cpmctymc"-->
+              <!--  label="药品名称"-->
+              <!--&gt;-->
+              <!--</el-table-column>-->
               <el-table-column
-                prop="cpmctymc"
-                label="药品名称"
+                prop="nameCode"
+                label="产品标识"
               >
               </el-table-column>
               <el-table-column
-                prop="nameCode"
-                label="药品标识"
+                prop="bzgg"
+                label="制剂规格"
               >
               </el-table-column>
               <el-table-column
@@ -210,14 +235,14 @@
               >
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="splitCodeTotal>0"
-              :total="splitCodeTotal"
-              :limit.sync="splitCodeQuery.limit"
-              :page.sync="splitCodeQuery.page"
-              @pagination="getSplitCodes()"
-            >
-            </pagination>
+            <!--<pagination-->
+            <!--  v-show="splitCodeTotal>0"-->
+            <!--  :total="splitCodeTotal"-->
+            <!--  :limit.sync="splitCodeQuery.limit"-->
+            <!--  :page.sync="splitCodeQuery.page"-->
+            <!--  @pagination="getSplitCodes()"-->
+            <!--&gt;-->
+            <!--</pagination>-->
 
             <!--</div>-->
 
diff --git a/src/views/collect/newCreateCodeDetail.vue b/src/views/collect/newCreateCodeDetail.vue
index 1fd8a43a..05e5b000 100644
--- a/src/views/collect/newCreateCodeDetail.vue
+++ b/src/views/collect/newCreateCodeDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :gutter="30">
-      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 20px; overflow-y: scroll;">
+      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 400px; margin-left: 20px; overflow-y: scroll;">
         <h2 style="font-weight: bold;">上货信息</h2>
         <div v-for="(item, index) in detailList" :key="index" class="product-info">
           <div class="info-item">
@@ -20,7 +20,7 @@
         </div>
 
       </el-col>
-      <el-col :span="8" style="border: 1px solid #e3dfe1; margin-left: 20px; padding: 15px;height: 700px;">
+      <el-col :span="8" style="border: 1px solid #e3dfe1; margin-left: 20px; padding: 15px;height: 400px;">
         <h2 style="font-weight: bold;">扫码明细({{codeCount}})</h2>
         <!--<el-divider></el-divider>-->
         <div style=" border-top: 1px solid #ccc;">
@@ -298,7 +298,7 @@ export default {
   font-size: 38px;
 }
 .p-title{
-  font-size: 24px;
+  font-size: 18px;
 
 }
 </style>