chenc 4 vuotta sitten
vanhempi
commit
f972668565

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

@@ -36,7 +36,7 @@
       <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]="16">
+          <nz-form-control [nzSpan]="22" style="text-align: right;">
             <!-- 查询 -->
             <button nz-button nzType="primary" (click)="query()">查询</button>
           </nz-form-control>
@@ -52,22 +52,22 @@
       <tr>
         <!-- <th>姓名</th> -->
         <th>日期</th>
-        <th>加班工时</th>
-        <th>培训</th>
-        <th>会议</th>
-        <th>5S</th>
-        <th>研发</th>
-        <th>质量</th>
-        <th>设计</th>
-        <th>返工</th>
-        <th>物料</th>
-        <th>能源</th>
-        <th>其他</th>
-        <th>设备</th>
-        <th>计划</th>
-        <th>配料</th>
-        <th>入库</th>
-        <th>打包</th>
+        <th nzAlign="center">加班工时</th>
+        <th nzAlign="center">培训</th>
+        <th nzAlign="center">会议</th>
+        <th nzAlign="center">5S</th>
+        <th nzAlign="center">研发</th>
+        <th nzAlign="center">质量</th>
+        <th nzAlign="center">设计</th>
+        <th nzAlign="center">返工</th>
+        <th nzAlign="center">物料</th>
+        <th nzAlign="center">能源</th>
+        <th nzAlign="center">其他</th>
+        <th nzAlign="center">设备</th>
+        <th nzAlign="center">计划</th>
+        <th nzAlign="center">配料</th>
+        <th nzAlign="center">入库</th>
+        <th nzAlign="center">打包</th>
         <th style="width:15%">{{ 'table.operation' | translate }}</th>
       </tr>
     </thead>
@@ -76,22 +76,22 @@
         <!-- <td >{{item.milestoneCode}}</td> -->
         <!-- <td>{{item.name}}</td> -->
         <td>{{item.date}}</td>
-        <td>{{item.overtimeHours}}</td>
-        <td>{{item.train}}</td>
-        <td>{{item.meeting}}</td>
-        <td>{{item.fiveS}}</td>
-        <td>{{item.researchAndDevelopment}}</td>
-        <td>{{item.quality}}</td>
-        <td>{{item.design}}</td>
-        <td>{{item.rework}}</td>
-        <td>{{item.materiel}}</td>
-        <td>{{item.energy}}</td>
-        <td>{{item.other}}</td>
-        <td>{{item.equipment}}</td>
-        <td>{{item.plan}}</td>
-        <td>{{item.mixedIngredients}}</td>
-        <td>{{item.warehousing}}</td>
-        <td>{{item.pack}}</td>
+        <td nzAlign="center">{{item.overtimeHours}}</td>
+        <td nzAlign="center">{{item.train}}</td>
+        <td nzAlign="center">{{item.meeting}}</td>
+        <td nzAlign="center">{{item.fiveS}}</td>
+        <td nzAlign="center">{{item.researchAndDevelopment}}</td>
+        <td nzAlign="center">{{item.quality}}</td>
+        <td nzAlign="center">{{item.design}}</td>
+        <td nzAlign="center">{{item.rework}}</td>
+        <td nzAlign="center">{{item.materiel}}</td>
+        <td nzAlign="center">{{item.energy}}</td>
+        <td nzAlign="center">{{item.other}}</td>
+        <td nzAlign="center">{{item.equipment}}</td>
+        <td nzAlign="center">{{item.plan}}</td>
+        <td nzAlign="center">{{item.mixedIngredients}}</td>
+        <td nzAlign="center">{{item.warehousing}}</td>
+        <td nzAlign="center">{{item.pack}}</td>
         <td>
           <!-- 详情 -->
           <a (click)="view(item)">{{ 'table.view' | translate }}</a>

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

@@ -35,7 +35,7 @@
       <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]="16">
+          <nz-form-control [nzSpan]="22" style="text-align: right;">
             <!-- 查询 -->
             <button nz-button nzType="primary" (click)="query()">查询</button>
           </nz-form-control>
@@ -95,13 +95,13 @@
         <th>日期</th>
         <th>生产订单号</th>
         <th>产品</th>
-        <th>计划数量</th>
-        <th>派工数量</th>
-        <th>标准工时</th>
-        <th>完成数量</th>
-        <th>完成工时</th>
-        <th>达成率</th>
-        <th>生产效率</th>
+        <th nzAlign="center">计划数量</th>
+        <th nzAlign="center">派工数量</th>
+        <th nzAlign="center">标准工时</th>
+        <th nzAlign="center">完成数量</th>
+        <th nzAlign="center">完成工时</th>
+        <th nzAlign="center">达成率</th>
+        <th nzAlign="center">生产效率</th>
         <th>状态</th>
         <!-- <th>计划开工时间</th>
         <th>计划完工时间</th> -->
@@ -115,13 +115,13 @@
         <td>{{item.date}}</td>
         <td>{{item.productionOrderNumberName}}</td>
         <td style="width: 15%;">{{item.product}}</td>
-        <td>{{item.plannedQuantity}}</td>
-        <td>{{item.numberOfTasks}}</td>
-        <td>{{item.standardWorkingHours}}</td>
-        <td>{{item.latestCompletedQuantity}}</td>
-        <td>{{item.manHoursCompleted}}</td>
-        <td>{{item.numberEfficiency}}%</td>
-        <td>{{item.workingHoursEfficiency}}%</td>
+        <td  nzAlign="center" >{{item.plannedQuantity}}</td>
+        <td nzAlign="center">{{item.numberOfTasks}}</td>
+        <td nzAlign="center">{{item.standardWorkingHours}}</td>
+        <td nzAlign="center">{{item.latestCompletedQuantity}}</td>
+        <td nzAlign="center">{{item.manHoursCompleted}}</td>
+        <td nzAlign="center">{{item.numberEfficiency}}%</td>
+        <td nzAlign="center">{{item.workingHoursEfficiency}}%</td>
         <td>
           <nz-badge nzStatus="yellow" *ngIf="item.state=='0'" nzText="派工"></nz-badge>
           <nz-badge nzStatus="green" *ngIf="item.state=='1'" nzText="上岗"></nz-badge>
@@ -149,11 +149,11 @@
         <td></td>
         <td></td>
         <td></td>
-        <td>{{totalList.plannedQuantity}}</td>
-        <td>{{totalList.numberOfTasks}}</td>
-        <td>{{totalList.standardWorkingHours}}</td>
-        <td>{{totalList.latestCompletedQuantity}}</td>
-        <td>{{totalList.manHoursCompleted}}</td>
+        <td nzAlign="center">{{totalList.plannedQuantity}}</td>
+        <td nzAlign="center">{{totalList.numberOfTasks}}</td>
+        <td nzAlign="center">{{totalList.standardWorkingHours}}</td>
+        <td nzAlign="center">{{totalList.latestCompletedQuantity}}</td>
+        <td nzAlign="center">{{totalList.manHoursCompleted}}</td>
         <td></td>
         <td></td>
         <td></td>