Merge branch 'master' of http://139.196.39.194:9021/yuansh/FBS_VIEW

pages/dashboard/quality.html

@@ -83,7 +83,7 @@
                 </div> -->
             </div>
             <div class="col-lg-4 col-md-4" style="width: 33%;">
-                <div class="row" style="padding-top:70px;">
+                <div class="row" style="padding-top:10px;">
                     <div class="col-lg-6 col-md-6">
                         <div class="quality-block-1 center">当天到货批数</div>
                         <div class="quality-block-2 center">{{todayArriveSum}}</div>
@@ -101,7 +101,7 @@
                         <div class="quality-block-2 center">{{notInSum}}</div>
                     </div>
                 </div>
-                <div class="row" style="margin-top: 80px;">
+                <div class="row" style="margin-top: 10px;">
                     <div class="col-lg-12 col-md-12 center block-title">当月供检验合格率</div>
                 </div>
                 <div class="row" style="width: 150%;">
@@ -113,26 +113,26 @@
                     <div class="col-lg-12 col-md-12 center block-title">当前已到货未入库情况</div>
                 </div>
                 <div class="row block-padding">
-                    <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>
-                    <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>
-                    <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">序号</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">计划<br/>到货日期</div>
+                    <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 style="width: 18%;" 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-1 col-md-1 center no-padding">到货<br />数量</div>
-                    <div class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">到货<br />数量</div>
+                    <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: 200px;">
+                    <div class="col-lg-12 col-md-12" style="height: 130px;">
                         <div class="row" v-for="product in waitingInList">
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.cVenCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
+                            <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%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
+                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
+                            <div style="width: 17%;" class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
                         </div>
                     </div>
                 </div>
@@ -323,7 +323,7 @@
                     const waitingInList = ServiceMaterial.getWatingInList();
                     this.cacheDataObject.waitingInList = {
                         data: waitingInList,
-                        pagesize: 5,
+                        pagesize: 3,
                         pageindex: 0
                     }
                     this.waitingInList = waitingInList.slice(0, this.cacheDataObject