项目调整

js/content/mycharts.js

@@ -54,9 +54,31 @@ var ChartsService = {
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
-                    },
-                    interval:0,  
-                    rotate:30  
+                    }
+                    // ,
+                    // interval:0,  
+                    // rotate:30  
+                    ,
+                     //换行显示
+                    formatter: function(value) {
+                        let result = '' //拼接加\n返回的类目项
+                        let maxLength = 5 //每项显示文字个数
+                        let valLength = value.length //X轴类目项的文字个数
+                        let rowNumber = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                        if (rowNumber > 1) {
+                        //如果文字大于3,
+                        for (let i = 0; i < rowNumber; i++) {
+                            let temp = '' //每次截取的字符串
+                            let start = i * maxLength //开始截取的位置
+                            let end = start + maxLength //结束截取的位置
+                            temp = value.substring(start, end) + '\n'
+                            result += temp //拼接生成最终的字符串
+                        }
+                        return result
+                        } else {
+                        return value
+                        }
+                    }
                 },
                 axisLine: {
                     lineStyle: {

js/service/material.js

@@ -525,8 +525,9 @@ var ServiceMaterial={
             element.materialCode=element.cinvcode
             element.materialName=element.cinvname
             element.specs=""//element.cinvstd
-            element.applyPerson=""
+            element.applyPerson=element.cmaker
             element.applysum=element.unfinishedQuantity
+            element.cdepName=element.cdepName
         });
         
         return materialList;
@@ -534,7 +535,7 @@ var ServiceMaterial={
     },
     // 领料申请完成数量
     getApplyCompleteSum:function(){
-        return 10;
+        return MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getApplyCompleteSum");
     },
     // 未来几天内到货计划
     getWillArriveList:function(days){

js/service/person.js

@@ -59,21 +59,21 @@ var ServicePerson={
     },
     // 人员月出勤率,考勤人数，总人数
     getMonthAttendance:function(){
-        // const list = [];
-        // list.push({label:"10",sum1:45,sum2:50});
-        // list.push({label:"11",sum1:48,sum2:50});
-        // list.push({label:"12",sum1:47,sum2:50});
-        // list.push({label:"01",sum1:40,sum2:50});
-        // list.push({label:"02",sum1:42,sum2:50});
-        // list.push({label:"03",sum1:44,sum2:50});
-        // list.push({label:"04",sum1:45,sum2:50});
-        // list.push({label:"05",sum1:47,sum2:50});
-        // list.push({label:"06",sum1:48,sum2:50});
-        // list.push({label:"07",sum1:46,sum2:50});
-        // list.push({label:"08",sum1:49,sum2:50});
-        // list.push({label:"09",sum1:0,sum2:0});
-        // return list;
-        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getAttendance");
+        const list = [];
+        list.push({label:"01",sum1:0,sum2:0});
+        list.push({label:"02",sum1:0,sum2:0});
+        list.push({label:"03",sum1:0,sum2:0});
+        list.push({label:"04",sum1:0,sum2:0});
+        list.push({label:"05",sum1:0,sum2:0});
+        list.push({label:"06",sum1:0,sum2:0});
+        list.push({label:"07",sum1:0,sum2:0});
+        list.push({label:"08",sum1:0,sum2:0});
+        list.push({label:"09",sum1:0,sum2:0});
+        list.push({label:"10",sum1:0,sum2:0});
+        list.push({label:"11",sum1:48,sum2:50});
+        list.push({label:"12",sum1:0,sum2:0});
+        return list;
+        // return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getAttendance");
     },
     // 人员日出勤率,考勤人数，总人数
     getDayAttendance:function(){

js/service/product.js

@@ -67,6 +67,7 @@ var ServiceProduct = {
     // 月成品出货统计，根据成品维度
     getMonthSend: function () {
         // return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
+        
         return getService.methodGet("/fbsDispatchLists/fbsDispatchLists/getProjectDelivery");
 
         // return {
@@ -86,7 +87,8 @@ var ServiceProduct = {
         //     "项目D": 150,
         //     "项目E": 200,
         // };
-        return MethodGetService.methodGet("/fbsDispatchLists/fbsDispatchLists/getMonthSendByProject");
+        var getMonthSendByProject=MethodGetService.methodGet("/fbsDispatchLists/fbsDispatchLists/getMonthSendByProject");
+        return getMonthSendByProject;
 
     },
     // 成品库存，物料维度

pages/dashboard/line.html

@@ -94,8 +94,8 @@
                                 <div class="col-lg-8 col-md-8" style="padding-left: 4px;padding-top: 10px;">
                                     <!-- <div class="task-block-text">预计开工日期：{{task.planStartDate}}</div> -->
                                     <div class="task-block-text">完工日期：{{task.planCompleteDate}}</div>
-                                    <div class="task-block-text">料号：{{task.productId}}</div>
-                                    <div class="task-block-text">存货：{{task.materialName}}</div>
+                                    <div class="task-block-text">产品编码：{{task.productId}}</div>
+                                    <div class="task-block-text">产品名称：{{task.materialName}}</div>
                                     <!-- <div class="task-block-text">规格：{{task.specs}}</div> -->
                                     <!-- <div class="task-block-text">规格：{{task.specs}}</div> -->
                                     <div class="task-block-text">
@@ -128,11 +128,12 @@
                 <div class="row block-padding">
                     <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 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-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 class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList">
@@ -141,8 +142,9 @@
                     <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.specs}}</div> -->
                     <div 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.planSum}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.workHour}}</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">{{product.name}}</div>
                     <!-- <div 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}">

pages/dashboard/produce.html

@@ -70,12 +70,12 @@
                 <div class="row block-padding">
                     <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 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: 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 style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">完成进度(已<span style="background-color:#5bc0de">&nbsp;&nbsp;&nbsp;</span>/未<span style="background-color:#f0ad4e">&nbsp;&nbsp;&nbsp;</span>)</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 380px;">
@@ -90,12 +90,13 @@
                             <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}}
+                                    {{product.completePercent}}
                                 </div>
                                 <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
                                     aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
-                                    {{product.incompleteSum}}
+                                    {{product.incompletePercent}}
                                 </div>
+                                
                             </div>
                         </div>
                     </div>
@@ -139,28 +140,28 @@
                     <div class="col-lg-12 col-md-12" style="height:260px" id="charts_31"></div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">项目进度完工百分比</div>
+                    <div class="col-lg-12 col-md-12 center block-title">项目进度完工</div>
                 </div>
                 <div class="row block-padding" style="height: 33%;min-height: 220px;">
                     <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
                     <!--月生产计划-->
                 <div class="col-lg-12 col-md-12">
-                    <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-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 class="col-lg-2 col-md-2 center no-padding">完工百分比</div>
                 </div>
                 <div class="col-lg-12 col-md-12">
                     <div class="col-lg-12 col-md-12" >
                         <div class="row" v-for="product in projectScheduleCompletionList">
-                            <div class="col-lg-3 col-md-3 center no-padding">{{product.productionOrderNumberName}}</div>
+                            <!-- <div class="col-lg-3 col-md-3 center no-padding">{{product.productionOrderNumberName}}</div> -->
                             <div class="col-lg-3 col-md-3 center no-padding">{{product.projectName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.numberOfTasks}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.standardWorkingHours}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.manHoursCompleted}}</div>
-                            <!-- <div class="col-lg-2 col-md-2 center no-padding progress">
+                            <div 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}}
@@ -169,7 +170,7 @@
                                     aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
                                     {{product.incompleteSum}}
                                 </div>
-                            </div> -->
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -200,8 +201,8 @@
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
         // ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
         //                 ChartsService.getGridSpanSmall());
-        var initSize = 9;
-        var pageSize = 9;
+        var initSize = 3;
+        var pageSize = 3;
         var pageIndex = 0;
         const weekInBycategoryList = ServiceProduct.getWeekInByCategory();
         setTimeout(beginFun("charts_24",weekInBycategoryList,2000,"charts_24"),500);

pages/dashboard/warehouse.html

@@ -75,13 +75,13 @@
                 </div>
                 <div class="row">
                     <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 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">到货数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding">入库数量</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>
                 <div class="row" style="height: 30%;overflow:hidden;min-height:150px">
                     <div class="col-lg-12 col-md-12" >
@@ -92,8 +92,8 @@
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{material.freceivedqty}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                         </div>
                     </div>
                 </div>
@@ -111,17 +111,17 @@
                     </div>
                 </div>
                 
-                <!--安全库存-->  
+                <!--安全库存--> 
                 <div class="row block-padding">
 
-                    <div class="col-lg-12 col-md-12 center block-title">安全库存</div>
+                    <div class="col-lg-12 col-md-12 block-title">安全库存</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-2 col-md-2 center no-padding">物料编码</div>
-                    <div class="col-lg-4 col-md-4 center no-padding">名称</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
+                    <div class="col-lg-4 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-2 col-md-2 center no-padding">总数量</div>
+                    <!-- <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%;overflow:hidden;min-height:150px">
@@ -132,7 +132,7 @@
                                 :class="getMaterialStockNotEnoughClass(material)">
                                 {{material.realStockSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div> -->
                         </div>
                     </div>
                 </div>
@@ -189,7 +189,7 @@
                     <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-3 col-md-3 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-1 col-md-1 center no-padding">发货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
@@ -296,10 +296,10 @@
                 </div>
                 <div class="row block-padding">
                     <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 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-1 col-md-1 center no-padding">缺料</div>
                 </div>
@@ -326,7 +326,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">工单缺料</span>
+                        <span class="block-title">工单缺料明细</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{orderSheetMaterialNotEnoughSum}}</span>
                     </div>
@@ -334,10 +334,10 @@
                 <div class="row block-padding">
                     <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 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="row"  style="height: 23%;overflow:hidden;min-height:180px">
                     <div class="col-lg-12 col-md-12">
@@ -347,7 +347,7 @@
                             <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.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>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div> -->
                         </div>
                     </div>
                 </div>
@@ -363,10 +363,10 @@
                 </div>
                 <div class="row block-padding">
                     <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 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="row">
@@ -391,11 +391,12 @@
                     </div>
                 </div>
                 <div class="row block-padding">
-                    <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 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="row">
@@ -406,6 +407,7 @@
                             <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.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.applyPerson}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.cdepName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.applysum}}</div>
                         </div>
                     </div>
@@ -441,8 +443,8 @@
         var interval = setInterval(getMonthSendData,10000);//项目月发货统计
         var interval1 = setInterval(getMonthSendData1,10000);//成品库存
 
-        var initSize = 8;
-        var pageSize = 8;
+        var initSize = 5;
+        var pageSize = 5;
         var pageIndex = 0;
         const monthSend = ServiceProduct.getMonthSend();
         let monthSendList = [];
@@ -450,7 +452,7 @@
             monthSendList.push([key, monthSend[key]]);
         }
 
-        var pageSize1 = 8;
+        var pageSize1 = 5;
         var pageIndex1 = 0;
         const stockDate = ServiceProduct.getStockList();
         let stockList = [];
@@ -464,7 +466,7 @@
                 clearInterval(interval);
             }
             if(pageIndex >= monthSendList.length){
-                pageSize = 8;
+                pageSize = 5;
                 pageIndex = 0;
             }
             let lsit = monthSendList.slice(pageIndex, pageSize);