调整

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

@@ -137,7 +137,7 @@
         <tr *ngFor="let data of columnTable.data;let i = index">
           <ng-container *ngIf="data.projectName!=='统计'">
           <!-- *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines" -->
-          <td  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.sort }}</td>
+          <td nzAlign="center"  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.sort }}</td>
           <td  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.projectName }}</td>
           <td >{{ data.productionOrderNumberName }}</td>
           <td >{{data.productId}}</td>

src/app/routes/fbs-abnormal-working-hours/add/add.component.html

@@ -229,7 +229,14 @@
               placeholder="请输入" />
                 </ng-container>
               </td>
-              <td>{{data.plannedQuantity}}</td>
+              <td>
+                <ng-container *ngIf="data.type=='产品'">
+                  {{data.plannedQuantity}}
+                </ng-container>
+                <ng-container *ngIf="data.type=='物料'">
+                  <nz-input-number [(ngModel)]="data.plannedQuantity" [nzMin]="0" [nzStep]="1"></nz-input-number>
+                </ng-container>
+              </td>
               <td>
                 <nz-input-number [(ngModel)]="data.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number>
               </td>

src/app/routes/fbs-abnormal-working-hours/list/list.component.html

@@ -105,6 +105,26 @@
 
         </td>
       </tr>
+      <tr style="font-weight:bolder;text-align: center;">
+        <td>总计</td>
+        <td>{{totalList.overtimeHours}}</td>
+        <td>{{totalList.train}}</td>
+        <td>{{totalList.meeting}}</td>
+        <td>{{totalList.fiveS}}</td>
+        <td>{{totalList.researchAndDevelopment}}</td>
+        <td>{{totalList.quality}}</td>
+        <td>{{totalList.design}}</td>
+        <td>{{totalList.rework}}</td>
+        <td>{{totalList.materiel}}</td>
+        <td>{{totalList.energy}}</td>
+        <td>{{totalList.other}}</td>
+        <td>{{totalList.equipment}}</td>
+        <td>{{totalList.plan}}</td>
+        <td>{{totalList.mixedIngredients}}</td>
+        <td>{{totalList.warehousing}}</td>
+        <td>{{totalList.pack}}</td>
+        <td></td>
+      </tr>
     </tbody>
   </nz-table>
 </nz-card>

src/app/routes/fbs-abnormal-working-hours/list/list.component.ts

@@ -55,6 +55,7 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
       if(response.success){//查询成功
         this.dataList=response.result.records;//表格数据
         this.page=response.result;//分页数据
+        this.getTotal();//统计合计
         this.isLoading=false;
       }
     })
@@ -150,6 +151,59 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
     })
   }
 
+
+  /**
+   * 初始化总计
+   */
+  totalList: any = {};
+  initializationTotal() {
+    this.totalList = {
+      overtimeHours: 0,
+      train: 0,
+      meeting: 0,
+      fiveS: 0,
+      researchAndDevelopment: 0,
+      quality: 0,
+      design: 0,
+      rework: 0,
+      materiel: 0,
+      energy: 0,
+      other: 0,
+      equipment: 0,
+      plan: 0,
+      mixedIngredients: 0,
+      warehousing: 0,
+      pack: 0
+    };
+  }
+
+  /**
+   * 计算当页的总计数据
+   */
+  getTotal() {
+    this.initializationTotal();
+    if (this.dataList) {
+      this.dataList.forEach(element => {
+        this.totalList.overtimeHours = (Number(this.totalList.overtimeHours) + Number(element.overtimeHours)).toFixed(1);
+        this.totalList.train = (Number(this.totalList.train) + Number(element.train)).toFixed(1);
+        this.totalList.meeting = (Number(this.totalList.meeting) + Number(element.meeting)).toFixed(1);
+        this.totalList.fiveS = (Number(this.totalList.fiveS) + Number(element.fiveS)).toFixed(1);
+        this.totalList.researchAndDevelopment = (Number(this.totalList.researchAndDevelopment) + Number(element.researchAndDevelopment)).toFixed(1);
+        this.totalList.quality = (Number(this.totalList.quality) + Number(element.quality)).toFixed(1);
+        this.totalList.design = (Number(this.totalList.design) + Number(element.design)).toFixed(1);
+        this.totalList.rework = (Number(this.totalList.rework) + Number(element.rework)).toFixed(1);
+        this.totalList.materiel = (Number(this.totalList.materiel) + Number(element.materiel)).toFixed(1);
+        this.totalList.energy = (Number(this.totalList.energy) + Number(element.energy)).toFixed(1);
+        this.totalList.other = (Number(this.totalList.other) + Number(element.other)).toFixed(1);
+        this.totalList.equipment = (Number(this.totalList.equipment) + Number(element.equipment)).toFixed(1);
+        this.totalList.plan = (Number(this.totalList.plan) + Number(element.plan)).toFixed(1);
+        this.totalList.mixedIngredients = (Number(this.totalList.mixedIngredients) + Number(element.mixedIngredients)).toFixed(1);
+        this.totalList.warehousing = (Number(this.totalList.warehousing) + Number(element.warehousing)).toFixed(1);
+        this.totalList.pack = (Number(this.totalList.pack) + Number(element.pack)).toFixed(1);
+      });
+    }
+  }
+
   /**
    * 导出
    */

src/app/routes/fbs-abnormal-working-hours/update/update.component.html

@@ -226,7 +226,14 @@
               placeholder="请输入" />
                 </ng-container>
               </td>
-              <td>{{data.plannedQuantity}}</td>
+              <td>
+              <ng-container *ngIf="data.type=='产品'">
+                {{data.plannedQuantity}}
+              </ng-container>
+              <ng-container *ngIf="data.type=='物料'">
+                <nz-input-number [(ngModel)]="data.plannedQuantity" [nzMin]="0" [nzStep]="1"></nz-input-number>
+              </ng-container>
+              </td>
               <td><nz-input-number [(ngModel)]="data.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
               <td><textarea rows="1" nz-input [(ngModel)]="data.describes"></textarea></td>
               <td>

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

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

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

@@ -97,6 +97,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     this.initializationTotal();
     if (this.dataList) {
       this.dataList.forEach(element => {
+        element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
         this.totalList.plannedQuantity = this.totalList.plannedQuantity + Number(element.plannedQuantity);
         this.totalList.numberOfTasks = this.totalList.numberOfTasks + Number(element.numberOfTasks);
         this.totalList.standardWorkingHours =
@@ -104,8 +105,10 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
         this.totalList.latestCompletedQuantity =
           this.totalList.latestCompletedQuantity + Number(element.latestCompletedQuantity);
         this.totalList.manHoursCompleted = this.totalList.manHoursCompleted + Number(element.manHoursCompleted);
+
       });
-      this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(2);
+      this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(1);
+      this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
     }
   }
 

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

@@ -163,7 +163,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
     if(data){
       if(data.standardWorkingHoursZ&&event){
         // data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
-        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(2)
+        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(1)
       }
     }
   }