异常工时统计

src/app/entity/fbs/fbs-abnormal-working-hours.ts

@@ -20,7 +20,9 @@ export class FbsAbnormalWorkingHours extends Page{
 	/**会议*/
 	meeting?:string;
 	/**5s*/
-	fiveS?:string;
+  fiveS?:string;
+  /**研发*/
+  researchAndDevelopment?:string;
 	/**质量*/
 	quality?:string;
 	/**设计*/
@@ -46,6 +48,8 @@ export class FbsAbnormalWorkingHours extends Page{
 	/**改善措施*/
 	improvementMeasures?:string;
 	/**备注*/
-	memo?:string;
+  memo?:string;
+  /**生产线名称*/
+  productionLineName?:string;
 }
 

src/app/entity/fbs/fbs-workshop-dispatch-list.ts

@@ -27,4 +27,6 @@ export class FbsWorkshopDispatchList extends Page{
 	plannedEndTime?:string;
 	/**备注*/
 	memo?:string;
+  /**生产线名称*/
+  productionLineName?:string;
 }

src/app/layout/default/header/header.component.html

@@ -1,6 +1,6 @@
 <div class="alain-default__header-logo">
   <a [routerLink]="['/']" class="alain-default__header-logo-link">
-    <img class="alain-default__header-logo-expanded" src="./assets/fangda_logo.png" alt="{{settings.app.name}}"
+    <img class="alain-default__header-logo-expanded" src="./assets/fbs.png" alt="{{settings.app.name}}"
       style="max-height:40px;" />
     <img class="alain-default__header-logo-collapsed" src="./assets/fangda_logo_b.png" alt="{{settings.app.name}}"
       style="max-height:30px;" />

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

@@ -1,5 +1,6 @@
 <nz-spin [nzSpinning]="saveLoading">
-  <nz-table nzSize="small" [nzNoResult]="' '" nzBordered #basicTable [nzShowPagination]="false">
+  <!-- 主数据 -->
+  <nz-table nzSize="small" [nzNoResult]="' '" nzBordered #basicTable [nzShowPagination]="false" style="margin-bottom: 5px;">
     <thead>
       <tr>
         <!-- 异常工时信息统计单 -->
@@ -19,8 +20,8 @@
             </ng-container>
           </nz-select>
         </td>
-        <td style="width: 25%;" colSpan="2">日期</td>
-        <td style="width: 25%;" colspan="2">
+        <td style="width: 25%;">日期</td>
+        <td style="width: 25%;" colspan="3">
           <nz-date-picker [(ngModel)]="fbsAbnormalWorkingHours.date" nzPlaceHolder="请选择">
           </nz-date-picker>
         </td>
@@ -28,22 +29,139 @@
       <tr>
         <td>加班记录</td>
         <td>加班工时</td>
-        <td></td>
-        <td colspan="2">加班原因</td>
-        <td colspan="2"></td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.overtimeHours" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td>加班原因</td>
+        <td colspan="3">
+          <textarea rows="2" nz-input [(ngModel)]="fbsAbnormalWorkingHours.overtimeReason"></textarea>
+        </td>
       </tr>
       <tr>
-        <td style="width: 25%;">其他工时统计</td>
+        <td style="width: 25%;" rowSpan="2">其他工时统计</td>
         <td style="width: 10%;">培训</td>
-        <td style="width: 15%;"></td>
+        <td style="width: 15%;">
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.train" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
         <td style="width: 10%;">会议</td>
-        <td style="width: 15%;"></td>
+        <td style="width: 15%;">
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.meeting" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
         <td style="width: 10%;">5S</td>
-        <td style="width: 15%;"></td>
+        <td style="width: 15%;">
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.fiveS" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+      </tr>
+      <tr>
+        <td>研发</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.researchAndDevelopment" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td colSpan="5"></td>
+      </tr>
+      <tr>
+        <td rowSpan="3">异常工时统计</td>
+        <td>质量</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.quality" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+        <td>设计</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.design" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+        <td>返工</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rework" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+      </tr>
+      <tr>
+        <td>物料</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.materiel" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+        <td>能源</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.energy" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+        <td>其他</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.other" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+      </tr>
+      <tr>
+        <td>设备</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.equipment" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
+        <td>计划</td>
+        <td colSpan="4">
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.plan" [nzMin]="0" [nzStep]="1"></nz-input-number>
+        </td>
       </tr>
     </tbody>
   </nz-table>
+
+  <!-- 子表数据 -->
+  <div nz-row nzGutter="24">
+    <!-- 异常原因描述 -->
+    <div nz-col nzMd="24" nzLg="12">
+      <nz-card nzTitle="异常原因描述">
+        <!-- 按钮 -->
+        <div nz-row [nzGutter]="24">
+          <div nz-col nzMd="24" nzLg="24">
+            <button (click)="describeAddRow()" nz-button nzType="primary">新增</button>
+          </div>
+        </div>
+        <!-- 表格 -->
+        <nz-table style="margin-top: 5px;" nzSize="small" #editRowTable nzBordered [nzData]="describeList" [nzShowPagination]="false">
+          <thead>
+            <tr>
+              <th>序号</th>
+              <th>异常原因描述</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of editRowTable.data">
+              <td>{{data.sort}}</td>
+              <td>{{data.describe}}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </nz-card>
+    </div>
+
+    <!-- 异常类型 -->
+    <div nz-col nzMd="24" nzLg="12">
+      <nz-card nzTitle="异常类别">
+        <!-- 按钮 -->
+        <div nz-row [nzGutter]="24">
+          <div nz-col nzMd="24" nzLg="24">
+            <button (click)="typeAddRow()" nz-button nzType="primary">新增</button>
+          </div>
+        </div>
+        <!-- 表格 -->
+        <nz-table style="margin-top: 5px;" nzSize="small" #typeTable nzBordered [nzData]="typeList" [nzShowPagination]="false">
+          <thead>
+            <tr>
+              <th>序号</th>
+              <th>异常类型</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of typeTable.data">
+              <td>{{data.sort}}</td>
+              <td>{{data.typeName}}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </nz-card>
+    </div>
+
+  </div>
 </nz-spin>
+
 <!-- 底部按钮 -->
 <div class="base">
   <!-- 底部关闭按钮 -->

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

@@ -35,6 +35,40 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
 
   saveLoading=false;//加载效果
   fbsAbnormalWorkingHours:FbsAbnormalWorkingHours={}
+  properList=[];//人员下拉选择集合
+
+  describeList=[];//异常描述集合表格数据
+  /**
+   * 描述增加行按钮
+   */
+  describeSort=1;
+  describeAddRow(){
+    this.describeList = [
+      ...this.describeList,
+      {
+        describe:'',
+        sort: this.describeSort,
+      },
+    ];
+    this.describeSort++;
+  }
+
+  typeList=[];//异常类型集合表格数据
+  /**
+   * 异常类型增加行按钮
+   */
+  typeSort=1;
+  typeAddRow(){
+    this.typeList = [
+      ...this.typeList,
+      {
+        typeName:'',
+        sort: this.typeSort,
+      },
+    ];
+    this.typeSort++;
+  }
+
 
   /**
    * 保存按钮