1

js/service/material.js

@@ -369,7 +369,7 @@ var ServiceMaterial={
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
-            element.materialName=""//element.cinvname
+            element.materialName=element.cinvname
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
             element.stockSum=element.shortageQuantity
@@ -467,7 +467,7 @@ var ServiceMaterial={
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
-            element.materialName=""//element.cinvname
+            element.materialName=element.cinvname
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
             element.stockSum=element.issQty
@@ -523,7 +523,7 @@ var ServiceMaterial={
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
-            element.materialName=""//element.cinvname
+            element.materialName=element.cinvname
             element.specs=""//element.cinvstd
             element.applyPerson=""
             element.applysum=element.unfinishedQuantity

js/session.js

@@ -85,4 +85,44 @@ function getQueryVariable(variable){
             }
     }
     return(false);
-}
+}
+
+
+function beginFun(chartsID,dataMap,autoTime,timeName){
+    return function(){autoInitDate(chartsID,dataMap,autoTime,timeName)} 
+}
+
+function autoInitDate(chartsID,dataMap,autoTime,timeName){
+    let DataList = [];
+    for(let key in dataMap) {
+        DataList.push([key, dataMap[key]]);
+    }
+    if(DataList.length < 1){
+        return;
+    }
+    timeName = setInterval(beginFun2(chartsID,DataList,timeName),autoTime);
+    
+}
+
+function beginFun2(chartsID,DataList,timeName){
+    return function(){autoLoadDate(chartsID,DataList,timeName)} 
+}
+
+function autoLoadDate(chartsID,DataList,timeName){
+   
+    if(DataList.length <= initSize){
+        clearInterval(timeName);
+    }
+    if(pageIndex > DataList.length){
+        pageSize = 8;
+        pageIndex = 0;
+    }
+    let lsit = DataList.slice(pageIndex, pageSize);
+    pageIndex = pageSize+1;
+    pageSize = pageSize + initSize;
+    let map = {}
+    for(let key in lsit) {
+        map[lsit[key][0]] = lsit[key][1];
+    }
+    ChartsService.initCommonBar(chartsID,map);
+}

pages/dashboard/produce.html

@@ -68,26 +68,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">工单号</div>
-                    <div class="col-lg-2 col-md-2 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>
-                    <div class="col-lg-2 col-md-2 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>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding" >工单号</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">项目名</div>
+                    <div style="width: 15%;" class="col-lg-1 col-md-1 center no-padding">料号</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">名称</div>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">计划数量</div>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">工时</div>
+                    <div style="width: 20%;" 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: 380px;">
                         <div class="row" v-for="product in mouthProduceTaskList">
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.projectName}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding progress">
+                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
+                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.projectName}}</div>
+                            <div style="width: 15%;" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
+                            <div style="width: 20%;" 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.planSum}}</div>
+                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding progress">
                                 <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
                                     aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">
                                     {{product.completeSum}}

pages/dashboard/warehouse.html

@@ -436,8 +436,8 @@
     <script src="/js/service/product.js?_v=1"></script>
     <script src="/js/content/mycharts.js?_v=1"></script>
     <script type="text/javascript">
-
-
+        // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
+        // setTimeout(beginFun("charts_11",monthSend,2000,"123123"),500);
         var interval = setInterval(getMonthSendData,10000);//项目月发货统计
         var interval1 = setInterval(getMonthSendData1,10000);//成品库存