upihau 1.2

src/views/collect/PannelOrderBiz.vue

@@ -116,15 +116,15 @@
               :row-style="{ height: '60px' }"
               :cell-style="{ padding: '0' }"
     >
-      <el-table-column label="赋码状态" prop="cpmctymc">
-        <template v-slot="scope">
-          <div style="text-align: center;">
-            <el-tag :type="getTagColor(scope.row)" size="26">
-              {{ codingStatus }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
+      <!--<el-table-column label="赋码状态" prop="cpmctymc">-->
+      <!--  <template v-slot="scope">-->
+      <!--    <div style="text-align: center;">-->
+      <!--      <el-tag :type="getTagColor(scope.row)" size="26">-->
+      <!--        {{ codingStatus }}-->
+      <!--      </el-tag>-->
+      <!--    </div>-->
+      <!--  </template>-->
+      <!--</el-table-column>-->
       <el-table-column label="产品通用名" prop="cpmctymc">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.cpmctymc }}</div>
@@ -135,16 +135,16 @@
           <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
         </template>
       </el-table-column>
-      <!--<el-table-column label="应扫码数量" prop="scanActCount" :min-width="120">-->
-      <!--  <template v-slot="scope">-->
-      <!--    <div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">-->
-      <!--      无需扫码-->
-      <!--    </div>-->
-      <!--    <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 60px;" v-else>-->
-      <!--      {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}-->
-      <!--    </div>-->
-      <!--  </template>-->
-      <!--</el-table-column>-->
+      <el-table-column label="应扫码数量" prop="scanActCount" :min-width="120">
+        <template v-slot="scope">
+          <div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
+            无需扫码
+          </div>
+          <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 60px;" v-else>
+            {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="制剂规格" prop="prepnSpec">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.prepnSpec }}</div>