袁少华 4 rokov pred
rodič
commit
b0ef9a6070
1 zmenil súbory, kde vykonal 13 pridanie a 13 odobranie
  1. 13 13
      pages/dashboard/warehouse.html

+ 13 - 13
pages/dashboard/warehouse.html

@@ -51,7 +51,7 @@
                         <span class="block-title-important">{{userSum}}</span>
                     </div>
                 </div>
-                <div class="row"  style="height: 20%;min-height: 160px;">
+                <div class="row"  style="height: 20%;min-height: 150px;height: 150px">
                     <div class="person-div" v-for="user in userList" style="text-align: center;margin-left: 10px;">
                         <div style="width:110px;">
                             <img height="140" width="110" v-bind:src="'/upPersonnel/warehouse/'+user.fileName" border="0" />
@@ -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:170px;height:170px">
+                <div class="row" style="height: 30%;overflow:hidden;min-height:150px;height:150px">
                     <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:170px;height:170px">
+                    <div class="col-lg-12 col-md-12" style="height: 30%;min-height:150px;height:150px">
                         <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: 45%;overflow:hidden; word-break:break-all;white-space:nowrap;padding-left: 40px;" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
@@ -231,7 +231,7 @@
                             <div class="col-lg-12 col-md-12 center block-title-important">项目月发货统计</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-12" style="height:440px" id="charts_11"></div>
+                            <div class="col-lg-12 col-md-12" style="height:420px" id="charts_11"></div>
                         </div>
                     </div>
                     <!-- <div class="col-lg-6">
@@ -279,7 +279,7 @@
                             <div class="col-lg-12 col-md-12 center block-title-important">成品库存</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:500px" id="charts_22"></div>
+                            <div class="col-lg-12 col-md-2" style="height:480px" id="charts_22"></div>
                         </div>
                     </div>
 
@@ -306,7 +306,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">已备数</div>
                     <div class="col-lg-1 col-md-1 center no-padding">缺料</div>
                 </div>
-                <div class="row"  style="overflow:hidden;min-height:150px;height:150px">
+                <div class="row"  style="overflow:hidden;min-height:160px;height:160px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="material in orderSheetMaterialList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
@@ -342,7 +342,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">数量</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">已备数</div> -->
                 </div>
-                <div class="row"  style="height: 23%;overflow:hidden;min-height:180px;height:180px">
+                <div class="row"  style="height: 23%;overflow:hidden;min-height:160px;height:160px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
@@ -373,7 +373,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: 21%;overflow:hidden;min-height:180px;height:180px">
+                    <div class="col-lg-12 col-md-12"  style="height: 21%;overflow:hidden;min-height:160px;height:160px">
                         <div class="row" v-for="material in orderSheetMaterialEnoughList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
@@ -403,7 +403,7 @@
                     <div class="col-lg-1 col-md-1 center no-padding">数量</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12"  style="height: 23%;overflow:hidden;min-height:180px;height:180px">
+                    <div class="col-lg-12 col-md-12"  style="height: 23%;overflow:hidden;min-height:160px;height:160px">
                         <div class="row" v-for="material in applyMaterialList">
                             <div class="col-lg-2 col-md-1 center no-padding">{{material.ddate}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
@@ -695,7 +695,7 @@
                     const materialStockList = ServiceMaterial.getStockList();
                     this.cacheDataObject.materialStockList = {
                         data: materialStockList,
-                        pagesize: 10,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.materialStockList = materialStockList.slice(0, this.cacheDataObject
@@ -718,7 +718,7 @@
                         
                     this.cacheDataObject.orderSheetMaterialList = {
                         data: orderSheetMaterialList,
-                        pagesize: 10,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject
@@ -728,7 +728,7 @@
                     this.orderSheetMaterialNotEnoughSum = orderSheetMaterialNotEnoughList.length;
                     this.cacheDataObject.orderSheetMaterialNotEnoughList = {
                         data: orderSheetMaterialNotEnoughList,
-                        pagesize: 9,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.orderSheetMaterialNotEnoughList = orderSheetMaterialNotEnoughList.slice(0, this
@@ -753,7 +753,7 @@
                     this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
                     this.cacheDataObject.applyMaterialList = {
                         data: applyMaterialList,
-                        pagesize: 9,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject