1

pages/dashboard/produce.html

@@ -182,7 +182,7 @@
                     <div class="col-lg-12 col-md-12 center block-title">月度项目发货统计</div>
                 </div>
                 <div class="row" style="height: 33%;">
-                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_33"></div>
+                    <div class="col-lg-12 col-md-12" style="height:250px" id="charts_33"></div>
                 </div>
             </div>
         </div>

pages/dashboard/quality.html

@@ -67,7 +67,7 @@
                             <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
                             <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding">{{product.cvenCode}}</div>
-                            <div style="width: 18%;" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap;width: 18%;" class="col-lg-1 col-md-1 left no-padding">{{product.materialCode}}</div>
                             <div style="overflow:hidden; word-break:break-all;white-space:nowrap;width: 20%;" class="col-lg-3 col-md-1 left no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
@@ -128,7 +128,7 @@
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.cVenCode}}</div>
-                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                            <div style="width: 15%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-2 col-md-2 left no-padding">{{product.materialCode}}</div>
                             <div style="width: 18%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>

pages/dashboard/warehouse.html

@@ -52,7 +52,7 @@
                     </div>
                 </div>
                 <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 class="person-div" v-for="user in userList" style="text-align: center;">
                         <div style="width:110px;">
                             <img height="140" width="110" v-bind:src="'/upPersonnel/warehouse/'+user.fileName" border="0" />
                         </div>
@@ -74,7 +74,7 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
+                    <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
                     <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">产品编码</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">产品名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
@@ -84,16 +84,16 @@
                     <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:150px;height:150px">
+                <div class="row" style="height: 30%;overflow:hidden;min-height:140px;height:140px">
                     <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>
+                            <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
                             <div style="width: 12%;" 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-2 col-md-2 left">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
-                            <div style="width: 13%;" class="col-lg-2 col-md-2 center">{{material.arriveSum}}</div>
-                            <div style="width: 6%;" class="col-lg-2 col-md-2 center">{{material.fInspectQuantity}}</div>
-                            <div style="width: 7%;" class="col-lg-2 col-md-2 center ">{{material.freceivedqty}}</div>
+                            <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">{{material.arriveSum}}</div>
+                            <div style="width: 6%;" class="col-lg-2 col-md-2 center no-padding">{{material.fInspectQuantity}}</div>
+                            <div style="width: 7%;" class="col-lg-2 col-md-2 center  no-padding">{{material.freceivedqty}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                         </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:150px;height:150px">
+                    <div class="col-lg-12 col-md-12" style="height: 30%;min-height:140px;height:140px">
                         <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>
@@ -180,7 +180,7 @@
                 <!--发货通知-->
                 <div class="row block-padding">
 
-                    <div class="col-lg-12  col-md-12" style="margin-top: 10px;">
+                    <div class="col-lg-12  col-md-12" style="margin-top: 5px;">
                         <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:160px;height:160px">
+                <div class="row" style="min-height:140px;height:140px">
                     <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>