Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/IoCreateOrder.vue

@@ -13,7 +13,7 @@
             <span style="font-size: 18px;font-weight: bold;color: red" >扫码总数量:</span>
             <span style="font-size: 18px;font-weight: bold;color: red">{{ scanReCount }}</span>
           </div>
-          <span style="font-size: 18px;font-weight: bold;color: red"
+          <span style="font-size: 26px;font-weight: bold;color: red"
                 v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
           <span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
           <el-button-group

src/views/collect/IocCollectOrderVerify.vue

@@ -114,11 +114,13 @@
                     :row-style="rowStyle"
           >
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="追溯码" prop="code" width="160"></el-table-column>            <el-table-column label="药品通用名称" prop="cpmctymc" width="110"></el-table-column>
+            <el-table-column label="追溯码" prop="code" width="160"></el-table-column>
-            <el-table-column label="包装规格" prop="ggxh" width="110"></el-table-column>
+            <el-table-column label="产品通用名" prop="cpmctymc" width="160"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="100"></el-table-column>
+            <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productDate"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
             <el-table-column label="序列号" prop="serialNo"></el-table-column>
             <el-table-column label="药品编码" prop="nameCode"></el-table-column>
             <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->

src/views/collect/newCreateCodeDetail.vue

@@ -6,9 +6,12 @@
         <div v-for="(item, index) in detailList" :key="index" class="product-info">
           <div class="info-item">
           <p class="p-title">产品通用名: {{ item.coName }}</p>
-          <p class="p-title">规格: {{ item.bzgg }}</p>
+            <p class="p-title">制剂规格: {{ item.prepnSpec }}</p>
-            <p class="p-title">产品标识: {{ item.nameCode }}</p>
+          <p class="p-title">包装规格: {{ item.bzgg }}</p>
+            <!--<p class="p-title">产品标识: {{ item.nameCode }}</p>-->
             <p class="p-title">批次号: {{ item.batchNo }}</p>
+            <p class="p-title">生产日期: {{ item.productDate }}</p>
+            <p class="p-title">失效日期: {{ item.expireDate }}</p>
           </div>
           <div class="count-items">
             <p class="p-title">扫码数量: <span class="scan-count">{{ item.count }}</span></p>