2/21 界面优化1.0

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"-->

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"-->