袁少华 4 سال پیش
والد
کامیت
f5d53e665e
1فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 8 8
      pages/dashboard/warehouse.html

+ 8 - 8
pages/dashboard/warehouse.html

@@ -51,9 +51,9 @@
                         <span class="block-title-important">{{userSum}}</span>
                     </div>
                 </div>
-                <div class="row"  style="height: 20%;min-height: 150px;height: 150px">
+                <div class="row"  style="height: 20%;min-height: 170px;height: 170px">
                     <div class="person-div" v-for="user in userList" style="text-align: center;">
-                        <div style="width:110px;margin-right: 5px;">
+                        <div style="width:110px;margin-right: 5px;margin-top: 10px;">
                             <img height="140" width="110" v-bind:src="'/upPersonnel/warehouse/'+user.fileName" border="0" />
                         </div>
                         <div style="width: 110px; overflow:hidden; word-break:break-all;white-space:nowrap">
@@ -180,7 +180,7 @@
                 <!--发货通知-->
                 <div class="row block-padding">
 
-                    <div class="col-lg-12  col-md-12" style="margin-top: 5px;">
+                    <div class="col-lg-12  col-md-12" style="margin-top:10px;">
                         <span class="block-title-important">发货通知</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{waitingSendProductSum}}</span>
@@ -196,7 +196,7 @@
                     <div style="width: 25%;" class="col-lg-1 col-md-1 center no-padding padding-line">发货数</div>
                     <div style="width: 10%;" class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
                 </div>
-                <div class="row" style="min-height:140px;height:140px">
+                <div class="row" style="min-height:160px;height:160px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="product in waitingSendProductList">
                             <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.cItemCode}}</div>
@@ -394,7 +394,7 @@
                     </div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-2 col-md-1 center no-padding">领料日期</div>
+                    <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 class="col-lg-3 col-md-4 center no-padding">产品名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">规格</div> -->
@@ -405,8 +405,8 @@
                 <div class="row">
                     <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>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.ddate}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-4 left no-padding">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.applyPerson}}</div>
@@ -686,7 +686,7 @@
                     this.waitingSendProductSumPercent = waitingSendProductSumPercent + '%';
                     this.cacheDataObject.waitingSendProductList = {
                         data: waitingSendProductList,
-                        pagesize: 7,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject