也页面调整 数据调整

src/app/routes/dashboard/analysis/analysis.component.html

@@ -70,15 +70,15 @@
       [nzScroll]="{ x: widthLength+'px', y:'550px'}" [nzShowPagination]="false" [nzFrontPagination]="false">
       <thead>
         <tr>
-          <th nzWidth="60px" nzAlign="center"><strong>序号</strong></th>
-          <th nzWidth="100px" nzAlign="center"><strong>项目名称</strong></th>
-          <th nzWidth="110px" nzAlign="center"><strong>生产订单号</strong></th>
-          <th nzWidth="120px" nzAlign="center"><strong>物料编码</strong></th>
-          <th nzWidth="100px" nzAlign="center"><strong>物料名称</strong></th>
-          <th nzWidth="80px" nzAlign="center"><strong>月度计划</strong></th>
-          <th nzWidth="100px" nzAlign="center"><strong>标准总工时</strong></th>
-          <th nzWidth="110px" nzAlign="center"><strong>累计完成数量</strong></th>
-          <th nzWidth="110px" nzAlign="center"><strong>累计完成工时</strong></th>
+          <th nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
+          <th nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
+          <th nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
+          <th nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
+          <th nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
+          <th nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>标准总工时</strong></th>
+          <th nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成数量</strong></th>
+          <th nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成工时</strong></th>
           <ng-container *ngFor="let date of dateList">
             <th nzWidth="120px" nzAlign="center"><strong>当日计划数量</strong></th>
             <th nzWidth="120px" nzAlign="center"><strong>当日完成数量</strong></th>
@@ -105,10 +105,10 @@
           <td>{{ data.productionOrderNumberName }}</td>
           <td>{{data.productId}}</td>
           <td>{{data.product}}</td>
-          <td>{{data.numberOfTasksTotal}}</td>
-          <td>{{data.standardWorkingHoursTotal}}</td>
-          <td>{{data.quantityCompletedTotal}}</td>
-          <td>{{data.manHoursCompletedTotal}}</td>
+          <td nzAlign="center">{{data.numberOfTasksTotal}}</td>
+          <td nzAlign="center">{{data.numberOfTasksTotal*data.standardWorkingHoursTotal}}</td>
+          <td nzAlign="center">{{data.quantityCompletedTotal}}</td>
+          <td nzAlign="center">{{data.manHoursCompletedTotal}}</td>
           <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
             <td>{{dateChild.numberOfTasks}}</td>
             <td>{{dateChild.qualifiedNumber}}</td>

src/app/routes/fbs-workshop-dispatch-list/add/add.component.ts

@@ -172,7 +172,8 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   numberOfTasksChange(event,data){
     if(data){
       if(data.standardWorkingHoursZ&&event){
-        data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
+        // data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
+        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(2)
       }
     }
   }

src/app/routes/fbs-workshop-dispatch-list/list/list.component.html

@@ -71,6 +71,7 @@
         <th>完成工时</th>
         <th>达成率</th>
         <th>生产效率</th>
+        <th>状态</th>
         <!-- <th>计划开工时间</th>
         <th>计划完工时间</th> -->
         <th style="width:15%">{{ 'table.operation' | translate }}</th>
@@ -89,6 +90,12 @@
         <td>{{item.manHoursCompleted}}</td>
         <td>{{item.numberEfficiency}}%</td>
         <td>{{item.workingHoursEfficiency}}%</td>
+        <td>
+          <nz-badge nzStatus="red" *ngIf="item.state=='0'" nzText="派工"></nz-badge>
+          <nz-badge nzStatus="orange" *ngIf="item.state=='1'" nzText="上岗"></nz-badge>
+          <nz-badge nzStatus="yellow" *ngIf="item.state=='2'" nzText="暂停"></nz-badge>
+          <nz-badge nzStatus="green" *ngIf="item.state=='3'" nzText="完工"></nz-badge>
+        </td>
         <!-- <td>{{item.plannedStartTime}}</td>
         <td>{{item.plannedEndTime}}</td> -->
         <td>

src/app/routes/fbs-workshop-dispatch-list/update/update.component.ts

@@ -132,7 +132,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
           this.fbsWorkshopDispatchList.plannedQuantity=element.qty;
           this.fbsWorkshopDispatchList.standardWorkingHoursZ=element.cinvdefine13;
           //计算总单据剩余派工数量
-          this.getDispatchNumberByOrderIdProductId(this.fbsWorkshopDispatchList);
+          // this.getDispatchNumberByOrderIdProductId(this.fbsWorkshopDispatchList);
         }
       });
     }
@@ -161,7 +161,8 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   numberOfTasksChange(event,data){
     if(data){
       if(data.standardWorkingHoursZ&&event){
-        data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
+        // data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
+        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(2)
       }
     }
   }