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

js/service/material.js

@@ -1077,11 +1077,7 @@ var ServiceMaterial={
             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"
+                        "/images/quality/12.png"
                     ]
         });
         var i = 1;

js/session.js

@@ -100,13 +100,6 @@ function autoInitDate(chartsID,dataMap,autoTime,timeName,grid){
     if(DataList.length < 1){
         return;
     }
-    
-    timeName = setInterval(beginFun2(chartsID,DataList,timeName,grid),autoTime);
-    
-}
-
-function beginFun2(chartsID,DataList,timeName,grid){
-
     let lsit = DataList.slice(pageIndex, pageSize);
     pageIndex = pageSize;
     pageSize = pageSize + initSize;
@@ -116,6 +109,13 @@ function beginFun2(chartsID,DataList,timeName,grid){
     }
     ChartsService.initCommonBar(chartsID,map,grid);
 
+    timeName = setInterval(beginFun2(chartsID,DataList,timeName,grid),autoTime);
+    
+}
+
+function beginFun2(chartsID,DataList,timeName,grid){
+
+ 
     return function(){autoLoadDate(chartsID,DataList,timeName,grid)} 
 }
 
@@ -129,6 +129,7 @@ function autoLoadDate(chartsID,DataList,timeName,grid){
         pageIndex = 0;
     }
     let lsit = DataList.slice(pageIndex, pageSize);
+    console.log(pageIndex+"-----"+pageSize);
     pageIndex = pageSize;
     pageSize = pageSize + initSize;
     let map = {}

pages/dashboard/produce.html

@@ -75,7 +75,7 @@
                     <div class="col-lg-3 col-md-3 center no-padding">产品名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">计划数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding">标准工时</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">已投入工时</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">实际工时</div>
                     <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div>
                     <!-- <span style="background-color:#5bc0de">&nbsp;&nbsp;&nbsp;</span> -->
                 </div>
@@ -153,7 +153,7 @@
                     <div class="col-lg-3 col-md-3 center no-padding">项目名</div>
                     <div class="col-lg-2 col-md-2 center no-padding">计划数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding">标准工时</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">已投入工时</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">实际工时</div>
                     <div class="col-lg-2 col-md-2 center no-padding">完工百分比</div>
                 </div>
                 <div class="col-lg-12 col-md-12">

pages/dashboard/quality.html

@@ -120,7 +120,7 @@
                     <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 padding-line">到货<br />数量</div>
-                    <div style="width: 17%;" class="col-lg-1 col-md-1 center no-padding padding-line">备注</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="min-height: 180px;height: 180px;">
@@ -175,7 +175,7 @@
                 <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-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-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 left no-padding">{{material.materialName}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
@@ -192,9 +192,9 @@
             </d>
             <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;margin-top:-30px ;"
+                    <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;" />
+                        <img :src="showimage" border="0" style="width:200px;height:280px;"/>
                     </div>
                 </div>
             </div>
@@ -344,7 +344,7 @@
                     const unpassList = ServiceMaterial.getQualityUnpassList();
                     this.cacheDataObject.unpassList = {
                         data: unpassList,
-                        pagesize: 8,
+                        pagesize: 10,
                         pageindex: 0
                     }
                     this.unpassList = unpassList.slice(0, this.cacheDataObject

pages/dashboard/warehouse.html

@@ -84,7 +84,7 @@
                     <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:180px;height:180px">
+                <div class="row" style="height: 30%;overflow:hidden;min-height:170px;height:170px">
                     <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>
@@ -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:180px;height:180px">
+                    <div class="col-lg-12 col-md-12" style="height: 30%;min-height:170px;height:170px">
                         <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: 40%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
@@ -333,9 +333,9 @@
                     </div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-3 col-md-3 center no-padding">工单号</div>
-                    <div class="col-lg-3 col-md-3 center no-padding">物料编码</div>
-                    <div class="col-lg-24 col-md-4 center no-padding">物料名称</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">物料编码</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">物料名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">规格</div> -->
                     <div class="col-lg-2 col-md-2 center no-padding">数量</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">已备数</div> -->
@@ -343,9 +343,9 @@
                 <div class="row"  style="height: 23%;overflow:hidden;min-height:180px;height:180px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
-                            <div class="col-lg-3 col-md-3 center no-padding">{{material.orderSheetCode}}</div>
-                            <div class="col-lg-3 col-md-3 center no-padding">{{material.materialCode}}</div>
-                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</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 left no-padding">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.needSum}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div> -->
@@ -442,8 +442,8 @@
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
         const monthSend = ServiceProduct.getMonthSend();
         const stockDate = ServiceProduct.getStockList();
-        setTimeout(beginFun("charts_11",monthSend,10000,"123123",ChartsService.getGridSpanSmall()),500);
-        setTimeout(beginFun("charts_22",stockDate,10000,"1231231",ChartsService.getGridSpanSmall()),500);
+        setTimeout(beginFun("charts_11",monthSend,10000,"charts_11",ChartsService.getGridSpanSmall()),500);
+        setTimeout(beginFun("charts_22",stockDate,10000,"charts_22",ChartsService.getGridSpanSmall()),500);
         // var interval = setInterval(getMonthSendData,10000);//项目月发货统计
         // var interval1 = setInterval(getMonthSendData1,10000);//成品库存
 
@@ -599,6 +599,10 @@
                             const startIndex = pageindex * pagesize;
                             const remainSum = dataList.length - startIndex;
                             const recordSum = remainSum >= pagesize ? pagesize : remainSum;
+                            const keyPar = dataList.slice(startIndex, startIndex + pagesize);
+                            if(keyPar.length < 1){
+                                continue;
+                            }
                             this[key] = dataList.slice(startIndex, startIndex + pagesize);
                         }
                     }