1

js/service/material.js

@@ -1075,6 +1075,14 @@ var ServiceMaterial={
             element.checkSum=element.fchkquantity;
             element.unpassSum=element.fchkinvalidqty;
             element.checkDate=element.ddate;
+            element.images=[
+                        "/images/quality/13.png",
+                        "/images/quality/12.png",
+                        "/images/quality/23.png",
+                        "/images/quality/22.png",
+                        "/images/quality/11.png",
+                        "/images/quality/21.png"
+                    ]
         });
         var i = 1;
         $.each(materialList, function(index,item){

pages/dashboard/quality.html

@@ -55,8 +55,8 @@
                     <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding padding-line">计划<br/>到货日期</div>
                     <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
-                    <div style="width: 14%;" class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
-                    <div style="width: 24%;" class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
+                    <div style="width: 18%;" class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
+                    <div style="width: 20%;" class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
                     <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">到货<br />数量</div>
                     <div  class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
@@ -67,8 +67,8 @@
                             <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: 14%;" 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: 24%;" class="col-lg-3 col-md-1 center no-padding">{{product.materialName}}</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: 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>
                             <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-3 center no-padding">{{product.cdefine12}}</div>
@@ -83,7 +83,7 @@
                 </div> -->
             </div>
             <div class="col-lg-4 col-md-4" style="width: 33%;">
-                <div class="row" style="padding-top:10px;">
+                <div class="row" style="padding-top:50px;padding-bottom: 50px;">
                     <div class="col-lg-6 col-md-6">
                         <div class="quality-block-1 center">当天到货批数</div>
                         <div class="quality-block-2 center">{{todayArriveSum}}</div>
@@ -92,11 +92,11 @@
                         <div class="quality-block-1 center">未来3天的到货总批数</div>
                         <div class="quality-block-2 center">{{willArriveSum}}</div>
                     </div>
-                    <div class="col-lg-6 col-md-6 quality-block">
+                    <div class="col-lg-6 col-md-6 quality-block" style="padding-top:20px;">
                         <div class="quality-block-1 center">当月到货总批数</div>
                         <div class="quality-block-2 center">{{thisMonthArriveSum}}</div>
                     </div>
-                    <div class="col-lg-6 col-md-6 quality-block">
+                    <div class="col-lg-6 col-md-6 quality-block" style="padding-top:20px;">
                         <div class="quality-block-1 center">未入库批数</div>
                         <div class="quality-block-2 center">{{notInSum}}</div>
                     </div>
@@ -123,13 +123,13 @@
                     <div style="width: 17%;" class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12" style="height: 120px;">
+                    <div class="col-lg-12 col-md-12" style="min-height: 180px;height: 180px;">
                         <div class="row" v-for="product in waitingInList">
                             <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: 18%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</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>
                             <div style="width: 17%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
@@ -154,7 +154,7 @@
             <div class="col-md-1 col-lg-1 center block-title" style="padding-top: 80px">
                 质<br />量<br />异<br />常<br />信<br />息
             </div>
-            <d class="col-md-6 col-lg-6">
+            <d class="col-md-6 col-lg-6" style="margin-top:-30px ;">
                 <div class="row">
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">检验日期</div>
@@ -177,7 +177,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">{{material.checkDate}}</div>
                     <div class="col-lg-1 col-md-2 center no-padding">{{material.vendorName}}</div>
                     <div 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-3 center no-padding">{{material.materialName}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{material.materialName}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                     <div class="col-lg-3 col-md-3 center no-padding">
                         <div class="row">
@@ -190,9 +190,9 @@
 
                 </div>
             </d>
-            <div class="col-md-4 col-lg-4 center">
+            <div class="col-md-4 col-lg-4 center" style="margin-left: 50px;">
                 <div class="row">
-                    <div class="col-md-4 col-lg-4 center " style="padding-bottom: 5px;"
+                    <div class="col-md-4 col-lg-4 center " style="padding-bottom: 5px;margin-top:-30px ;"
                         v-for="showimage in showImageList">
                         <img :src="showimage" border="0" style="width:150px;height:130px;" />
                     </div>
@@ -314,7 +314,7 @@
                     const willArriveMeterialList = ServiceMaterial.getWillArriveList(3);
                     this.cacheDataObject.willArriveMeterialList = {
                         data: willArriveMeterialList,
-                        pagesize: 15,
+                        pagesize: 20,
                         pageindex: 0
                     }
                     this.willArriveMeterialList = willArriveMeterialList.slice(0, this.cacheDataObject
@@ -323,7 +323,7 @@
                     const waitingInList = ServiceMaterial.getWatingInList();
                     this.cacheDataObject.waitingInList = {
                         data: waitingInList,
-                        pagesize: 5,
+                        pagesize: 7,
                         pageindex: 0
                     }
                     this.waitingInList = waitingInList.slice(0, this.cacheDataObject