2/25 字段优化1.0

src/views/collect/IocCollectOrderCheckCode.vue

@@ -144,18 +144,22 @@
           >
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="产品通用名" prop="cpmctymc" width="160"></el-table-column>
-            <el-table-column label="制剂规格" prop="prepnSpec" width="160"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="160">
+              <template #default="scope">
+                <span v-if="scope.row.prepnSpec!== null">{{ scope.row.prepnSpec }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="包装规格" prop="spec" width="100"></el-table-column>
             <!--            <el-table-column label="扫码数量" prop="scanActCount" width="80"></el-table-column>-->
             <!--            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>-->
             <!-- 扫码数量列 -->
-            <el-table-column label="扫码实际数量" width="100">
+        <!--    <el-table-column label="扫码实际数量" width="100">-->
-              <template slot-scope="scope">
+        <!--      <template slot-scope="scope">-->
-        <span :style="getScanActCountStyle(scope.row)">
+        <!--<span :style="getScanActCountStyle(scope.row)">-->
-          <strong>{{ scope.row.scanActCount }}</strong>
+        <!--  <strong>{{ scope.row.scanActCount }}</strong>-->
-        </span>
+        <!--</span>-->
-              </template>
+        <!--      </template>-->
-            </el-table-column>
+        <!--    </el-table-column>-->
             <!-- 单据数量列 -->
             <el-table-column label="单据数量" prop="count" width="80">
               <template slot-scope="scope">
@@ -216,9 +220,13 @@
             <el-table-column label="追溯码" prop="udiCode" width="160"></el-table-column>
             <el-table-column label="产品编码" prop="nameCode"></el-table-column>
             <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
-            <el-table-column label="制剂规格" prop="prepnSpec" width="160"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="160">
+              <template #default="scope">
+                <span v-if="scope.row.prepnSpec!== null">{{ scope.row.prepnSpec }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
-            <el-table-column label="扫码数量" prop="scanCount" width="110"></el-table-column>
+            <el-table-column label="扫码实际数量" prop="scanActCount" width="110"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
             <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>