调整

js/service/material.js

@@ -311,7 +311,7 @@ var ServiceMaterial={
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
-            element.materialName=""//element.cinvname
+            element.materialName=element.cinvname//element.cinvname
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
             element.stockSum=element.issQty
@@ -364,15 +364,15 @@ var ServiceMaterial={
         //     needSum:"25",
         //     stockSum:"20"
         // });
-        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=2");
-
+        // var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=2");
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNotEnough");
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
             element.materialName=element.cinvname
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
-            element.stockSum=element.shortageQuantity
+            element.stockSum=element.issQty
         });
         
         return materialList;
@@ -699,375 +699,395 @@ var ServiceMaterial={
     },
     // 未来几天内到货计划
     getQualityUnpassList:function(days){
-        const materialList = [];
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"100",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/11.png",
-                "/images/quality/12.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"200",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/13.png",
-                "/images/quality/21.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"300",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/22.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"400",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/11.png",
-                "/images/quality/12.png",
-                "/images/quality/13.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"500",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"600",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/11.png",
-                "/images/quality/12.png",
-                "/images/quality/13.png",
-                "/images/quality/21.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"100",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/12.png",
-                "/images/quality/13.png",
-                "/images/quality/21.png",
-                "/images/quality/22.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"200",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"300",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"400",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png",
-                "/images/quality/11.png",
-                "/images/quality/12.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"500",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/23.png",
-                "/images/quality/21.png",
-                "/images/quality/11.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/12.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"600",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            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"
-            ]
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"200",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/13.png",
-                "/images/quality/21.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"300",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/22.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"400",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/11.png",
-                "/images/quality/12.png",
-                "/images/quality/13.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"500",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"600",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/11.png",
-                "/images/quality/12.png",
-                "/images/quality/13.png",
-                "/images/quality/21.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"A公司",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            arriveSum:"100",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/12.png",
-                "/images/quality/13.png",
-                "/images/quality/21.png",
-                "/images/quality/22.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"B公司",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            arriveSum:"200",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"C公司",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            arriveSum:"300",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"D公司",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            arriveSum:"400",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/21.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/23.png",
-                "/images/quality/11.png",
-                "/images/quality/12.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"E公司",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            arriveSum:"500",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            images:[
-                "/images/quality/23.png",
-                "/images/quality/21.png",
-                "/images/quality/11.png",
-                "/images/quality/22.png",
-                "/images/quality/13.png",
-                "/images/quality/12.png"
-            ]
-        });
-        materialList.push({
-            vendorName:"F公司",
-            materialCode:"10006",
-            materialName:"物料F",
-            specs:"3*4",
-            arriveSum:"600",
-            checkSum:"10",
-            unpassSum:"1",
-            checkDate:"09月18日",
-            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"
-            ]
+        // const materialList = [];
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"100",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"200",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"300",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/22.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"400",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"500",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"600",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"100",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"200",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"300",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"400",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png",
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"500",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/23.png",
+        //         "/images/quality/21.png",
+        //         "/images/quality/11.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/12.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"600",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     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"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"200",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"300",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/22.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"400",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"500",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"600",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"A公司",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     arriveSum:"100",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/12.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"B公司",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     arriveSum:"200",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"C公司",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     arriveSum:"300",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"D公司",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     arriveSum:"400",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/21.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/23.png",
+        //         "/images/quality/11.png",
+        //         "/images/quality/12.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"E公司",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     arriveSum:"500",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     images:[
+        //         "/images/quality/23.png",
+        //         "/images/quality/21.png",
+        //         "/images/quality/11.png",
+        //         "/images/quality/22.png",
+        //         "/images/quality/13.png",
+        //         "/images/quality/12.png"
+        //     ]
+        // });
+        // materialList.push({
+        //     vendorName:"F公司",
+        //     materialCode:"10006",
+        //     materialName:"物料F",
+        //     specs:"3*4",
+        //     arriveSum:"600",
+        //     checkSum:"10",
+        //     unpassSum:"1",
+        //     checkDate:"09月18日",
+        //     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"
+        //     ]
+        // });
+        var materialList=MethodGetService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getQualityUnpassList");
+        materialList.forEach(element => {
+            element.vendorName=element.cvencode;
+            element.materialCode=element.cinvcode;
+            element.materialName=element.cinvName;
+            element.arriveSum=element.iArrQTY;
+            element.checkSum=element.fchkquantity;
+            element.unpassSum=element.fchkinvalidqty;
+            element.checkDate=element.ddate;
         });
         var i = 1;
         $.each(materialList, function(index,item){
+            if(!item.checkSum){
+                item.checkSum=0
+            }
             item.index = i++;
-            item.passRate = ((item.checkSum-item.unpassSum)/item.checkSum*100).toFixed(0)+"%";
+            if(!item.unpassSum){
+                item.unpassSum=0
+                item.passRate=0+"%";
+            }else{
+                item.passRate = ((item.checkSum-item.unpassSum)/item.checkSum*100).toFixed(0)+"%";
+            }
+           
+            
 
         })
         return materialList;

pages/dashboard/line.html

@@ -128,11 +128,11 @@
                 <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-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList">

pages/dashboard/produce.html

@@ -70,18 +70,18 @@
                 <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: 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: 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 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-2 col-md-2 center no-padding">{{product.define12}}</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>
@@ -148,7 +148,7 @@
                     <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>

pages/dashboard/quality.html

@@ -71,7 +71,7 @@
                             <div style="width: 24%;" class="col-lg-3 col-md-1 center no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
-                            <div  class="col-lg-1 col-md-3 center no-padding"><!--{{product.memo}}--></div>
+                            <div  class="col-lg-1 col-md-3 center no-padding">{{product.cdefine12}}</div>
                         </div>
                     </div>
                 </div>
@@ -132,7 +132,7 @@
                             <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.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.memo}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
                         </div>
                     </div>
                 </div>

pages/dashboard/warehouse.html

@@ -75,7 +75,7 @@
                 </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-1 col-md-1 center no-padding">到货数量</div>
@@ -117,7 +117,7 @@
                     <div class="col-lg-12 col-md-12 center block-title">安全库存</div>
                 </div>
                 <div class="row">
-                    <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-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>
@@ -147,7 +147,7 @@
                 </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-3 col-md-3 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>
@@ -188,7 +188,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-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-2 col-md-2 center no-padding padding-line">规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">发货数量</div>
@@ -251,7 +251,7 @@
                             <div class="col-lg-12 col-md-12 center block-title">安全库存</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-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>
@@ -296,7 +296,7 @@
                 </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>
@@ -333,7 +333,7 @@
                 </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>
@@ -363,7 +363,7 @@
                 </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>
@@ -392,7 +392,7 @@
                 </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>