fix:修复

src/views/collect/IoCreateOrder.vue

@@ -26,7 +26,7 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null"
+                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || redMesg"
             >扫码剔除
             </el-button>
             <el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"
@@ -40,7 +40,8 @@
             >选入已完成单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
-                       style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
+                       style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled "
+                       :disabled="redMesg"
             >选入单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
@@ -50,10 +51,12 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
                        v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
+                       :disabled="redMesg"
             >保存
             </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
+                       :disabled="redMesg"
             >上货完成
             </el-button>
             <!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"

src/views/collect/IocCollectOrderCheckCode.vue

@@ -136,6 +136,52 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <!--单据业务详情-->
+
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
+          <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
+                    :row-style="rowStyle"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="80"></el-table-column>
+            <el-table-column label="包装规格" prop="spec" width="80"></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="80">
+              <template slot-scope="scope">
+        <span :style="getScanActCountStyle(scope.row)">
+          <strong>{{ scope.row.scanActCount }}</strong>
+        </span>
+              </template>
+            </el-table-column>
+            <!-- 单据数量列 -->
+            <el-table-column label="单据数量" prop="count" width="80">
+              <template slot-scope="scope">
+                <strong>{{ scope.row.count }}</strong>
+              </template>
+            </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="expireDate"></el-table-column>
+            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+            <el-table-column label="医保编码" prop="ybbm"></el-table-column>
+            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="busDataTotal>0"
+            :total="busDataTotal"
+            :limit.sync="busQuery.limit"
+            :page.sync="busQuery.page"
+            @pagination="getBizDetailList"
+          ></pagination>
+        </el-tab-pane>
+
+
         <el-tab-pane>
           <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
           <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
@@ -162,31 +208,7 @@
             @pagination="getCodeList"
           ></pagination>
         </el-tab-pane>
-        <el-tab-pane>
+
-          <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
-          <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
-          >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
-            <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
-            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
-            <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
-            <el-table-column label="单据数量" prop="count" width="80"></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="expireDate"></el-table-column>
-            <el-table-column label="医保编码" prop="ybbm"></el-table-column>
-            <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
-            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
-          </el-table>
-          <pagination
-            v-show="busDataTotal>0"
-            :total="busDataTotal"
-            :limit.sync="busQuery.limit"
-            :page.sync="busQuery.page"
-            @pagination="getBizDetailList"
-          ></pagination>
-        </el-tab-pane>
       </el-tabs>
 
 
@@ -298,6 +320,21 @@ export default {
     }
   },
   methods: {
+    getScanActCountStyle(row) {
+      const progress = row.scanActCount / row.count;
+      let color;
+      if (progress < 0.5) {
+        color = 'red'; // 进度小于50%为红色
+      } else if (progress < 1.0) {
+        color = 'orange'; // 进度在50%到100%之间为橙色
+      } else {
+        color = 'green'; // 进度达到或超过100%为绿色
+      }
+      return {
+        color,
+        fontWeight: 'bold', // 字号加粗
+      };
+    },
     enterKey() {
       // this.result = "\n"
       this.errResult = ''