lucky 2 years ago
parent
commit
76510f7c86
2 changed files with 7 additions and 6 deletions
  1. 5 4
      src/views/bigScreen/datavScr/index.vue
  2. 2 2
      src/views/standingBook/detail.vue

+ 5 - 4
src/views/bigScreen/datavScr/index.vue

@@ -93,6 +93,8 @@
                 </dv-border-box-12>
               </div>
             </div>
+            <!-- 防止数据更新闪白屏 -->
+            <div style="width:100%;height:100vh;" v-if="!initFlag"></div>
           </div>
         </div>
       </div>
@@ -175,16 +177,15 @@ export default {
       }, 1000);
     },
     cancelLoading() {
-      setTimeout(() => {
+      // setTimeout(() => {
         this.loading = false;
-      }, 500);
+      // }, 0);
     },
 
     //一分钟更新一次数据
     timeInit() {
       this.time = null;
       this.time = setInterval(() => {
-        console.log(111);
         this.initFlag = false;
         setTimeout(() => {
           this.$message({
@@ -192,7 +193,7 @@ export default {
             type: "success",
           });
           this.initFlag = true;
-        }, 500);
+        }, 100);
       }, 60000);
     },
   },

+ 2 - 2
src/views/standingBook/detail.vue

@@ -6,7 +6,7 @@
     <Anchor height="900px" :data="anchorArray">
       <div style="width: 100%" v-if="tableData">
         <el-collapse v-model="activeNames" style="margin: -8px 0 0 0">
-          <div id="detail1"  v-if="tableData.order_type">
+          <div id="detail1"  v-if="(tableData.order_type)&&(tableData.skuCode || tableData.spuCode)">
             <el-collapse-item title="商品信息" name="1">
               <goodsDataTable
                 :newTime="newTime"
@@ -347,7 +347,7 @@ export default {
         companyNo,
         customer_code,
       } = obj;
-      (order_type ?? "") != ""
+      (order_type ?? "") != "" && ((spuCode ?? "")!="" || (skuCode ?? "")!="")
         ? arr.push({ tar: "#detail1", title: "商品信息" })
         : (flag = false);
       (cgdNo ?? "") != ""