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

js/service/material.js

@@ -716,10 +716,12 @@ var ServiceMaterial={
         //补上最后不足7
         if(map){
             var remainingQuantity=7-(Object.keys(map).length%7);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                console.log(bu)
-                map[bu]="";
+            if(remainingQuantity!=7){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    console.log(bu)
+                    map[bu]="";
+                }
             }
         }
         return map;

js/service/product.js

@@ -70,10 +70,12 @@ var ServiceProduct = {
         var map=getService.methodGet("/fbsDispatchLists/fbsDispatchLists/getProjectDelivery")
         if(map){
             var remainingQuantity=5-(Object.keys(map).length%5);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                console.log(bu)
-                map[bu]="";
+            if(remainingQuantity!=5){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    console.log(bu)
+                    map[bu]="";
+                }
             }
         }
         return map;
@@ -104,10 +106,12 @@ var ServiceProduct = {
         var map=getService.methodGet("/fbsInventory/fbsInventory/getAllStockList")
         if(map){
             var remainingQuantity=5-(Object.keys(map).length%5);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                console.log(bu)
-                map[bu]="";
+            if(remainingQuantity!=5){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    console.log(bu)
+                    map[bu]="";
+                }
             }
         }
         return map;
@@ -179,9 +183,11 @@ var ServiceProduct = {
         var list=MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getRejectsNumber")
         if(list){
             var remainingQuantity=3-(list.length%3);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                list.push({label: bu,sum1:0,sum2:0})
+            if(remainingQuantity!=3){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    list.push({label: bu,sum1:0,sum2:0})
+                }
             }
         }
         return list;
@@ -201,10 +207,12 @@ var ServiceProduct = {
         var map=MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursDescribe/getMonthExceptionByCategory")
         if(map){
             var remainingQuantity=3-(Object.keys(map).length%3);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                console.log(bu)
-                map[bu]="";
+            if(remainingQuantity!=3){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    console.log(bu)
+                    map[bu]="";
+                }
             }
         }
         return map;
@@ -223,10 +231,12 @@ var ServiceProduct = {
         var map =MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getQualifiedInQtyWeek");
         if(map){
             var remainingQuantity=3-(Object.keys(map).length%3);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                console.log(bu)
-                map[bu]="";
+            if(remainingQuantity!=3){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    console.log(bu)
+                    map[bu]="";
+                }
             }
         }
         return map;
@@ -293,9 +303,11 @@ var ServiceProduct = {
         var list=MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getRejectsNumber?type=1")
         if(list){
             var remainingQuantity=3-(list.length%3);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                list.push({label: bu,sum1:0,sum2:0})
+            if(remainingQuantity!=3){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    list.push({label: bu,sum1:0,sum2:0})
+                }
             }
         }
         return list;

js/service/workhour.js

@@ -83,9 +83,11 @@ var ServiceWorkhour={
 
         if(list){
             var remainingQuantity=3-(list.length%3);
-            for(var i=0;i<remainingQuantity;i++){
-                var bu="补"+i
-                list.push({label:"",label1:"标准工时",sum1:0,label2:"实际工时",sum2:0})
+            if(remainingQuantity!=3){
+                for(var i=0;i<remainingQuantity;i++){
+                    var bu="补"+i
+                    list.push({label:"",label1:"标准工时",sum1:0,label2:"实际工时",sum2:0})
+                }
             }
         }
 

pages/dashboard/line.html

@@ -83,9 +83,9 @@
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
                 </div>
             </div>
-            <div class="col-lg-6">
-                <div class="row block-padding">
-                    <div style="height: 200px;"  class="col-lg-4 col-md-4 padding-around" v-for="task in doingTaskList">
+            <div class="col-lg-6" >
+                <div class="row block-padding" style="height: 350px;">
+                    <div  class="col-lg-4 col-md-4 padding-around" v-for="task in doingTaskList">
                         <div class="task-block" :class="task.bgcss">
                             <div class="row ">
                                 <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>

pages/dashboard/produce.html

@@ -146,13 +146,13 @@
                 <div class="row block-padding"  style="min-height: 70px;">
                     <div class="col-lg-12 col-md-12 center block-title" style="margin-top: 10px;">当月生产效率</div>
                 </div>
-                <div class="row block-padding" style="height: 33%;min-height: 350px;">
+                <div class="row block-padding" style="height: 33%;min-height: 290px;">
                     <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>
-                <div class="row block-padding" style="height: 33%;min-height: 220px;">
+                <div class="row block-padding" style="height: 33%;min-height: 250px;">
                     <!-- <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div> -->
                     <!--月生产计划-->
                 <div class="col-lg-12 col-md-12">

pages/dashboard/warehouse.html

@@ -330,14 +330,13 @@
                         </div>
                     </div>
                 </div>
-
-                <!--工单缺料-->
+                <!--工单齐套-->
                 <div class="row block-padding">
 
-                    <div class="col-lg-12  col-md-12">
-                        <span class="block-title-important">工单缺料明细</span>
+                    <div class="col-lg-12 ">
+                        <span class="block-title-important">工单齐套通知</span>
                         &nbsp;&nbsp;
-                        <span class="block-title-important">{{orderSheetMaterialNotEnoughSum}}</span>
+                        <span class="block-title-important">{{orderSheetMaterialEnoughSum}}</span>
                     </div>
                 </div>
                 <div class="row block-padding">
@@ -346,28 +345,27 @@
                     <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>
-                <div class="row"  style="height: 23%;overflow:hidden;min-height:160px;height:160px">
-                    <div class="col-lg-12 col-md-12">
-                        <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
+                <div class="row">
+                    <div class="col-lg-12 col-md-12"  style="height: 21%;overflow:hidden;min-height:160px;height:160px">
+                        <div class="row" v-for="material in orderSheetMaterialEnoughList">
                             <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> -->
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div>
                         </div>
                     </div>
                 </div>
-
-                <!--工单齐套-->
+                <!--工单缺料-->
                 <div class="row block-padding">
 
-                    <div class="col-lg-12 ">
-                        <span class="block-title-important">工单齐套通知</span>
+                    <div class="col-lg-12  col-md-12">
+                        <span class="block-title-important">工单缺料明细</span>
                         &nbsp;&nbsp;
-                        <span class="block-title-important">{{orderSheetMaterialEnoughSum}}</span>
+                        <span class="block-title-important">{{orderSheetMaterialNotEnoughSum}}</span>
                     </div>
                 </div>
                 <div class="row block-padding">
@@ -376,20 +374,22 @@
                     <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>
-                <div class="row">
-                    <div class="col-lg-12 col-md-12"  style="height: 21%;overflow:hidden;min-height:160px;height:160px">
-                        <div class="row" v-for="material in orderSheetMaterialEnoughList">
+                <div class="row"  style="height: 23%;overflow:hidden;min-height:160px;height:160px">
+                    <div class="col-lg-12 col-md-12">
+                        <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
                             <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>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div> -->
                         </div>
                     </div>
                 </div>
+
+                
                 <!--领料申请-->
                 <div class="row block-padding">