袁少华 4 years ago
parent
commit
9426cf0a7a
1 changed files with 6 additions and 2 deletions
  1. 6 2
      pages/dashboard/warehouse.html

+ 6 - 2
pages/dashboard/warehouse.html

@@ -84,7 +84,7 @@
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">订单日期</div>
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
-                <div class="row" style="height: 30%;overflow:hidden;min-height:180px;height:180px">
+                <div class="row" style="height: 30%;overflow:hidden;min-height:170px;height:170px">
                     <div class="col-lg-12 col-md-12" >
                         <div class="row" v-for="material in waitingcheckMaterialList">
                             <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
@@ -126,7 +126,7 @@
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">总数量</div> -->
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12" style="height: 30%;min-height:180px;height:180px">
+                    <div class="col-lg-12 col-md-12" style="height: 30%;min-height:170px;height:170px">
                         <div class="row" v-for="material in materialStockList">
                             <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div style="width: 40%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
@@ -599,6 +599,10 @@
                             const startIndex = pageindex * pagesize;
                             const remainSum = dataList.length - startIndex;
                             const recordSum = remainSum >= pagesize ? pagesize : remainSum;
+                            const keyPar = dataList.slice(startIndex, startIndex + pagesize);
+                            if(keyPar.length < 1){
+                                continue;
+                            }
                             this[key] = dataList.slice(startIndex, startIndex + pagesize);
                         }
                     }