1

pages/dashboard/quality.html

@@ -52,35 +52,35 @@
                     <div class="col-lg-12 col-md-12 center block-title">未来3天的到货计划</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-1 col-md-1 center no-padding padding-line">物料号</div>
-                    <div class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
+                    <div style="width: 5%;" 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: 25%;" 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 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  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="row" v-for="product in willArriveMeterialList">
-                            <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-1 col-md-1 center no-padding">{{product.materialCode}}</div>
-                            <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
+                    <div class="col-lg-12 col-md-12" >
+                        <div class="row" v-for="product in willArriveMeterialList" style="overflow:hidden">
+                            <div style="width: 5%;" 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="width: 25%;" class="col-lg-3 col-md-1 center">{{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.memo}}</div>
+                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
+                            <div  class="col-lg-1 col-md-3 center no-padding"><!--{{product.memo}}--></div>
                         </div>
                     </div>
                 </div>
-                <div class="row block-padding">
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">近六个月的月度合格率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:300px" id="charts_11"></div>
-                </div>
+                </div> -->
             </div>
             <div class="col-lg-4 col-md-4">
                 <div class="row" style="padding-top:40px;">
@@ -136,6 +136,12 @@
                         </div>
                     </div>
                 </div>
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">近六个月的月度合格率</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height:300px" id="charts_11"></div>
+                </div>
                 <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">当月供应商合格率实时展示</div>
                 </div>
@@ -300,7 +306,7 @@
                     const willArriveMeterialList = ServiceMaterial.getWillArriveList(3);
                     this.cacheDataObject.willArriveMeterialList = {
                         data: willArriveMeterialList,
-                        pagesize: 3,
+                        pagesize: 20,
                         pageindex: 0
                     }
                     this.willArriveMeterialList = willArriveMeterialList.slice(0, this.cacheDataObject