修改

js/service/produce-task.js

@@ -326,7 +326,6 @@ var ServiceProduceTask = {
         // var taskList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getDayList");
         var taskList=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getListNotStarted");
         taskList.forEach(element=>{
-            element.projectName= element.projectName
             element.orderSheetCode= element.productionOrderNumberName
             element.materialCode=element.productId
             element.materialName=element.product

pages/dashboard/line.html

@@ -132,25 +132,27 @@
                     <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-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 class="col-lg-3 col-md-3 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-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>
                 <div class="row" v-for="product in dayProduceTaskList">
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.projectCode}}</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">{{product.projectName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                     <div style="overflow:hidden; word-break:break-all;white-space:nowrap" 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 style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{product.materialName}}</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-1 col-md-1 center no-padding">{{product.name}}</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</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/warehouse.html

@@ -74,7 +74,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title-important">收料待检</span>
+                        <span class="block-title-important">待入库</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{waitingcheckMaterialSum}}</span>
                     </div>
@@ -82,11 +82,11 @@
                 <div class="row">
                     <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
                     <div style="width: 12%;" 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" style="width: 19%;">物料名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
-                    <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货数</div>
-                    <div style="width: 6%;" class="col-lg-2 col-md-2 center no-padding padding-line">报检数</div>
-                    <div style="width: 7%;" class="col-lg-2 col-md-2 center no-padding padding-line">入库数</div>
+                    <div style="width: 9%;" class="col-lg-2 col-md-2 center no-padding padding-line">订单数</div>
+                    <div style="width: 8%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货数</div>
+                    <div style="width: 9%;" class="col-lg-2 col-md-2 center no-padding padding-line">入库数</div>
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">订单日期</div>
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
@@ -95,11 +95,11 @@
                         <div class="row" v-for="material in waitingcheckMaterialList">
                             <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
                             <div style="width: 12%;" 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-2 col-md-2 left">{{material.materialName}}</div>
+                            <div style="width: 19%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
-                            <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding">{{material.arriveSum}}</div>
-                            <div style="width: 6%;" class="col-lg-2 col-md-2 center no-padding">{{material.fInspectQuantity}}</div>
-                            <div style="width: 7%;" class="col-lg-2 col-md-2 center  no-padding">{{material.freceivedqty}}</div>
+                            <div style="width: 9%;" class="col-lg-2 col-md-2 center no-padding">{{material.iuantity}}</div>
+                            <div style="width: 8%;" class="col-lg-2 col-md-2 center no-padding">{{material.iarrQTY}}</div>
+                            <div style="width: 9%;" class="col-lg-2 col-md-2 center  no-padding">{{material.freceivedqty}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                         </div>
@@ -404,9 +404,9 @@
                     <div class="col-lg-2 col-md-2 center no-padding">物料编码</div>
                     <div class="col-lg-3 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-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">
                     <div class="col-lg-12 col-md-12"  style="height: 23%;overflow:hidden;min-height:160px;height:160px">
@@ -415,9 +415,9 @@
                             <div style="overflow:hidden; word-break:break-all;white-space:nowrap" 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-4 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.applyPerson}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.cdepName}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{material.applysum}}</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.applyPerson}}</div>
                         </div>
                     </div>
                 </div>
@@ -670,7 +670,7 @@
                     this.checkedMaterialSumPercent = checkedMaterialSumPercent + '%';
                     this.cacheDataObject.waitingcheckMaterialList = {
                         data: waitingcheckMaterialList,
-                        pagesize: 8,
+                        pagesize: 7,
                         pageindex: 0
                     }
                     this.waitingcheckMaterialList = waitingcheckMaterialList.slice(0, this.cacheDataObject