4/2 优化

src/views/collect/PannelOrderBiz.vue

@@ -135,12 +135,12 @@
           <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="应扫码数量" prop="scanActCount">
+      <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: 40px;" v-else>
+          <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>
@@ -415,6 +415,10 @@ export default {
         this.codingStatus = '预赋码'
         return 'warning' // 黄色
       }
+    if (row.scanActCount == null){
+      this.codingStatus = '未赋码'
+      return 'danger' //
+    }
       if (row.scanActCount < row.count) {
         this.codingStatus = '未赋码'
         return 'danger' // 红色
@@ -422,6 +426,7 @@ export default {
         this.codingStatus = '已赋码'
         return 'success' // 绿色
       }
+
     }
 
   },

src/views/myLogin.vue

@@ -11,7 +11,7 @@
         <div class="login-panel">
           <div class="header-section">
             <div class="logo-section">
-              <div v-if="webLogo == ''">
+              <div v-if="webLogo == null">
                 <img alt="logo" src="@/assets/logo/wyLogo.png" class="logo-image">
               </div>
               <div v-else>
@@ -188,7 +188,7 @@ export default {
       title: "福建省XXX医院",
       subTitle: "医院药械追溯管理系统",
       webVersionName: "医院药械追溯管理系统",
-      webLogo: "",
+      webLogo: null,
       passwordFormVisible: false,
       passwordFormData: {
         oldPassword: "",
@@ -394,7 +394,10 @@ export default {
         if (!isBlank(res.data.webVersion)){
           this.webVersionName = res.data.webVersion
         }
-        this.webLogo = res.data.webLogo
+        if (!isBlank(res.data.webLogo)){
+          this.webLogo = res.data.webLogo
+        }
+
       });
     },
     passwdSubmit() {