仓库 产线

js/service/material.js

@@ -308,8 +308,8 @@ var ServiceMaterial={
         //     stockSum:"20"
         // });
 
-        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=3");
-
+        // var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=3");
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNow?type=1");
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
             element.materialCode=element.cinvcode
@@ -367,13 +367,15 @@ var ServiceMaterial={
         //     stockSum:"20"
         // });
         // var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=2");
-        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNotEnough");
+        // var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNotEnough");
+        
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNow?type=3");
         console.log(materialList)
         if(materialList){
             materialList.forEach(element => {
             element.orderSheetCode=element.mocode
-            element.materialCode=element.cinvcode
-            element.materialName=element.cinvname
+            element.materialCode=element.mcinvcode
+            element.materialName=element.mcinvname
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
             element.stockSum=element.issQty
@@ -468,7 +470,8 @@ var ServiceMaterial={
         //     stockSum:"20"
         // });
 
-        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=1");
+        // var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=1");
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheetNow?type=2");
 
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode

pages/dashboard/line.html

@@ -59,8 +59,8 @@
                     <div class="col-lg-12  col-md-12 center block-title">产线人员信息</div>
                 </div>
                 <div class="row" style="height: 160px;">
-                    <div class="person-div" v-for="user in userList" style="text-align: center;margin-left:3%;">
-                        <div>
+                    <div class="person-div" v-for="user in userList" style="text-align: center;">
+                        <div style="margin-left:5px">
                             <img  height="140" width="100" v-bind:src="'/upPersonnel/Mechanice/'+user.fileName" border="0" />
                         </div>
                         <div style="width: 90px; overflow:hidden; word-break:break-all;white-space:nowrap">
@@ -101,7 +101,7 @@
                                 <div class="col-lg-3 col-md-3" style="text-align: center;padding: 19px 0px 0px 34px;margin-right: 7px;">
                                     <div class="task-block-title-small center">任务数量</div>
                                     <div class="task-block-title-big center">{{task.planSum}}</div>
-                                    <div class="task-block-title-small center" style="padding-top:17px;">已完工总数</div>
+                                    <div class="task-block-title-small center" style="padding-top:17px;">完工总数</div>
                                     <div class="task-block-title-big center">{{task.completeSum}}</div>
                                 </div>
                                 <div class="col-lg-8 col-md-8" style="padding-left: 4px;padding-top: 10px;">
@@ -131,7 +131,7 @@
                             </div>
                             <div class="row" style="padding-top: 12px;" >
                                 <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">工艺流程</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> -->

pages/dashboard/warehouse.html

@@ -379,7 +379,7 @@
                     <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 style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{material.mocinvname}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{material.cinvname}}</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> -->