esop 产线

js/service/material.js

@@ -377,7 +377,8 @@ var ServiceMaterial={
             element.materialCode=element.mcinvcode
             element.materialName=element.mcinvname
             element.specs=""//element.cinvstd
-            element.needSum=element.qtys
+            // element.needSum=element.qtys
+            element.needSum=element.shortageQuantity
             element.stockSum=element.issQty
         });
         }

js/service/product.js

@@ -68,6 +68,7 @@ var ServiceProduct = {
     getMonthSend: function () {
         // return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
         var map=getService.methodGet("/fbsDispatchLists/fbsDispatchLists/getProjectDelivery")
+        console.log(map)
         if(map){
             var remainingQuantity=5-(Object.keys(map).length%5);
             if(remainingQuantity!=5){
@@ -77,6 +78,23 @@ var ServiceProduct = {
                     map[bu]="";
                 }
             }
+            if(Object.keys(map).length==0){
+                map={
+                    "补1":0,
+                    "补2":0,
+                    "补3":0,
+                    "补4":0,
+                    "补5":0
+                }
+            }
+        }else{
+            map={
+                "补1":0,
+                "补2":0,
+                "补3":0,
+                "补4":0,
+                "补5":0
+            }
         }
         return map;
 

pages/dashboard/esop.html

@@ -190,21 +190,21 @@ iframe.height = iframeWin.document.documentElement.scrollHeight || iframeWin.doc
                     if(file=='pdf'){
                         hideAll();
                         $("#frameMain").show();
-                        // this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+marCode+"/"+name;
-                        this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+name;
+                        this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+marCode+"/"+name;
+                        // this.filepath = "/lib/pdfjs/web/viewer.html?file=/upFiles/"+name;
                         $("#videoType").attr('src',"");
                     }else if(file=='jpg' || file=='jpeg' || file=='png'){
                         hideAll();
                         $("#imgType").show();
-                        // $("#imgType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        $("#imgType").attr('src',"/upFiles/"+marCode+"/"+name);
                         
-                        $("#imgType").attr('src',"/upFiles/"+name);
+                        // $("#imgType").attr('src',"/upFiles/"+name);
                         $("#videoType").attr('src',"");
                     }else if(file=='avi' || file=='mov' || file=='rmvb' || file=='rm' || file=='flv' || file=='mp4' || file=='3gp'){
                         hideAll();
                         $("#videoType").show();
-                        // $("#videoType").attr('src',"/upFiles/"+marCode+"/"+name);
-                        $("#videoType").attr('src',"/upFiles/"+name);
+                        $("#videoType").attr('src',"/upFiles/"+marCode+"/"+name);
+                        // $("#videoType").attr('src',"/upFiles/"+name);
                     }else{
                         alert("暂时不支持该类型文件的展示");
                     }

pages/dashboard/line.html

@@ -129,9 +129,9 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row" style="padding-top: 12px;" >
+                            <div class="row" style="padding-top: 8px;" >
                                 <div class="col-lg-12 col-md-12 "  style="padding-left: 40px;overflow:hidden; word-break:break-all;white-space:nowrap">
-                                    <span class="task-block-text" ><span class="task-block-title-small center">工艺流程</span>
+                                    <span class="task-block-text" ><span class="task-block-title-small center" style="margin-right: 10%;">工艺流程</span>
                                         <span style="color: aliceblue;" v-for="(t,index) in task.fbsTechnologicalProcessItemList" >
                                             <!-- <span v-if="index==0&&t.isTechnological=='1'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:#1ABDE6;"></span>
                                             <span v-if="index==0&&t.isTechnological=='2'" style="font-size:15px;border-top-left-radius: 3px;border-bottom-left-radius: 3px;padding: 2px;background-color:orange;"></span> -->