Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4.git into develop4

谭毅彬
2 parents 3eeb67f9 57f7b11f
Showing 1 changed file with 13 additions and 7 deletions
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
@@ -93,14 +93,16 @@
       </div>
  
       <div class="col-sm-12 select-info">
-        <div id="borderCol" style="overflow-y: scroll;white-space:nowrap">
-          <a-spin tip="等待加载中..." :spinning="spinning">
+        <div id="borderCol" style="overflow-y: scroll;white-space:nowrap" v-show="showPrise">
           <div class="location" id="location">
           </div>
-        </a-spin>
         </div>
+        <a-spin tip="库位视图生成中..." :spinning="spinning">
+        <a-skeleton active :loading="loading" :paragraph="{ rows: 5 }"/>
+        </a-spin>
       </div>
  
+
     </div>
   </div>
 </template>
@@ -158,6 +160,9 @@
     data() {
       return {
         spinning:true,
+        loading:true,
+        showPrise:false,
+        // loading:true,
         zoneCode:'',
         locationTypeList: [],
         model:{},
@@ -437,6 +442,9 @@
             $(".grid").eq(j).attr({"src": rel_empty,"onmouseover": "","onclick": ""});
           }
         }
+        this.spinning=false;
+        this.showPrise=true;
+        this.loading=false;
       },
  
       //点击显示当前库位信息
@@ -532,11 +540,11 @@
       },
  
  
-
-
       //搜索平面库位
       Search(){
         this.spinning=true;
+        this.showPrise=false;
+        this.loading=true;
         let index=$("#editable-select").val();
         let num=$("#editable-num").val();
  
@@ -595,7 +603,6 @@
           this.changeMargin();
           this.ajaxGrid(index,data);
         }
-
         },
  
  
@@ -623,7 +630,6 @@
             if (response.code==200){
               $("#zone").val("库位总数："+response.result.location+", 空闲库位："+response.result.emptyLocation+
                 ", 空托盘库位："+response.result.haveContainLocation+", 有货库位："+response.result.haveInventoryLocation)
-              _this.spinning=false;
             }else {
               alert(response.message)
             }