首页

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

@@ -326,6 +326,7 @@ export class DashboardAnalysisComponent implements OnInit {
       let manHoursCompletedTotal=element.manHoursCompletedTotal;//完成工时
       if(element.projectName==="统计"){
         this.achievementRateTotal=((Number(quantityCompletedTotal)/Number(numberOfTasksTotal))*100).toFixed(1);
+        console.log(standardWorkingHoursActualTotal)
         this.productivityTotal=((Number(standardWorkingHoursActualTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
       }
     });

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

@@ -31,16 +31,17 @@
           </nz-form-control>
         </nz-form-item>
       </div>
-      <!-- 按钮 -->
+      <!-- 物料名称 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
-          <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
-          <nz-form-control [nzSpan]="22" style="text-align: right;">
-            <!-- 查询 -->
-            <button nz-button nzType="primary" (click)="query()">查询</button>
+          <nz-form-label [nzSpan]="8">物料名称</nz-form-label>
+          <nz-form-control [nzSpan]="16">
+            <input [(ngModel)]="fbsWorkshopDispatchList.product" name="product" nz-input
+              placeholder="请输入" />
           </nz-form-control>
         </nz-form-item>
       </div>
+      
     </div>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 生产订单号 -->
@@ -85,13 +86,13 @@
       </div>
     </div>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
-      <!-- 物料名称 -->
-      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+      <!-- 按钮 -->
+      <div nz-col nzXs="24" nzSm="4" nzLg="24">
         <nz-form-item class="nz-form-item">
-          <nz-form-label [nzSpan]="8">物料名称</nz-form-label>
-          <nz-form-control [nzSpan]="16">
-            <input [(ngModel)]="fbsWorkshopDispatchList.product" name="product" nz-input
-              placeholder="请输入" />
+          <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+          <nz-form-control [nzSpan]="22" style="text-align: right;">
+            <!-- 查询 -->
+            <button nz-button nzType="primary" (click)="query()">查询</button>
           </nz-form-control>
         </nz-form-item>
       </div>