1

pages/dashboard/quality.html

@@ -58,7 +58,7 @@
                     <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 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">到货<br />数量</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>
                 </div>
                 <div class="row">
@@ -68,10 +68,10 @@
                             <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: 24%;" class="col-lg-3 col-md-1 center no-padding">{{product.materialName}}</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 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  class="col-lg-1 col-md-3 center no-padding">{{product.cdefine12}}</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>
                         </div>
                     </div>
                 </div>
@@ -119,20 +119,20 @@
                     <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 style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">到货<br />数量</div>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">到货<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: 130px;">
+                    <div class="col-lg-12 col-md-12" style="height: 120px;">
                         <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%;" 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 center 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%;" class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</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>
                         </div>
                     </div>
                 </div>
@@ -157,10 +157,10 @@
             <d class="col-md-6 col-lg-6">
                 <div class="row">
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
-                    <div class="col-lg-1 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-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-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-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-3 col-md-3 center no-padding">
                         <div class="row">
@@ -174,10 +174,10 @@
                 </div>
                 <div class="row" v-for="material in unpassList" :class="material.bg">
                     <div class="col-lg-1 col-md-1 center no-padding">{{material.index}}</div>
-                    <div class="col-lg-1 col-md-2 center no-padding">{{material.checkDate}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">{{material.materialCode}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                    <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 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">
@@ -323,7 +323,7 @@
                     const waitingInList = ServiceMaterial.getWatingInList();
                     this.cacheDataObject.waitingInList = {
                         data: waitingInList,
-                        pagesize: 3,
+                        pagesize: 5,
                         pageindex: 0
                     }
                     this.waitingInList = waitingInList.slice(0, this.cacheDataObject
@@ -340,7 +340,7 @@
                     const unpassList = ServiceMaterial.getQualityUnpassList();
                     this.cacheDataObject.unpassList = {
                         data: unpassList,
-                        pagesize: 10,
+                        pagesize: 8,
                         pageindex: 0
                     }
                     this.unpassList = unpassList.slice(0, this.cacheDataObject