异常工时信息统计单基础数据

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

@@ -0,0 +1,51 @@
+import { Page } from '../page';
+
+export class FbsAbnormalWorkingHours extends Page{
+  /**异常工时统计表主键*/
+	id?:string;
+	/**姓名*/
+	name?:string;
+	/**u8人员id*/
+	personnelIdU8?:string;
+	/**u8人员名称*/
+	personnelNameU8?:string;
+	/**日期*/
+	date?:string;
+	/**加班工时*/
+	overtimeHours?:string;
+	/**加班原因*/
+	overtimeReason?:string;
+	/**培训*/
+	train?:string;
+	/**会议*/
+	meeting?:string;
+	/**5s*/
+	fiveS?:string;
+	/**质量*/
+	quality?:string;
+	/**设计*/
+	design?:string;
+	/**返工*/
+	rework?:string;
+	/**物料*/
+	materiel?:string;
+	/**能源*/
+	energy?:string;
+	/**其他*/
+	other?:string;
+	/**设备*/
+	equipment?:string;
+	/**计划*/
+	plan?:string;
+	/**异常原因描述*/
+	descriptionAbnormalCause?:string;
+	/**异常类别id*/
+	exceptionCategoryId?:string;
+	/**异常类被名称*/
+	exceptionCategoryName?:string;
+	/**改善措施*/
+	improvementMeasures?:string;
+	/**备注*/
+	memo?:string;
+}
+

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

@@ -6,9 +6,9 @@ export class FbsWorkshopDispatchList extends Page{
 	/**姓名*/
 	name?:string;
 	/**U8获取*/
-	idU8?:string;
+	personnelIdU8?:string;
 	/**U8获取*/
-	nameU8?:string;
+	personnelNameU8?:string;
 	/**日期*/
 	date?:string;
 	/**生产订单号id*/

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

@@ -0,0 +1,56 @@
+<nz-spin [nzSpinning]="saveLoading">
+  <nz-table nzSize="small" [nzNoResult]="' '" nzBordered #basicTable [nzShowPagination]="false">
+    <thead>
+      <tr>
+        <!-- 异常工时信息统计单 -->
+        <th colspan="7">
+          <h2><strong>异常工时信息统计单</strong></h2>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td style="width: 25%;">姓名</td>
+        <td style="width: 25%;" colSpan="2">
+          <nz-select [(ngModel)]="fbsAbnormalWorkingHours.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择">
+            <ng-container *ngFor="let proper of properList">
+              <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>
+            </ng-container>
+          </nz-select>
+        </td>
+        <td style="width: 25%;" colSpan="2">日期</td>
+        <td style="width: 25%;" colspan="2">
+          <nz-date-picker [(ngModel)]="fbsAbnormalWorkingHours.date" nzPlaceHolder="请选择">
+          </nz-date-picker>
+        </td>
+      </tr>
+      <tr>
+        <td>加班记录</td>
+        <td>加班工时</td>
+        <td></td>
+        <td colspan="2">加班原因</td>
+        <td colspan="2"></td>
+      </tr>
+      <tr>
+        <td style="width: 25%;">其他工时统计</td>
+        <td style="width: 10%;">培训</td>
+        <td style="width: 15%;"></td>
+        <td style="width: 10%;">会议</td>
+        <td style="width: 15%;"></td>
+        <td style="width: 10%;">5S</td>
+        <td style="width: 15%;"></td>
+      </tr>
+    </tbody>
+  </nz-table>
+</nz-spin>
+<!-- 底部按钮 -->
+<div class="base">
+  <!-- 底部关闭按钮 -->
+  <a nz-popconfirm style="margin-right: 2%" nzTitle="确认关闭吗(关闭前请确认数据已保存)" (nzOnConfirm)="close()">
+    <button nz-button class="ant-btn buttonDistance"><span>关闭
+      </span></button>
+  </a>
+  <!-- 底部保存按钮 -->
+  <button nzbutton (click)="save()" nz-button nzType="primary" [nzLoading]="saveLoading"><span>保存</span></button>
+</div>

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

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FbsAbnormalWorkingHoursAddComponent } from './add.component';
+
+describe('FbsAbnormalWorkingHoursAddComponent', () => {
+  let component: FbsAbnormalWorkingHoursAddComponent;
+  let fixture: ComponentFixture<FbsAbnormalWorkingHoursAddComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ FbsAbnormalWorkingHoursAddComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FbsAbnormalWorkingHoursAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,50 @@
+import { Component, OnInit } from '@angular/core';
+import { NzModalRef, NzMessageService, NzDrawerRef } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { FbsAbnormalWorkingHours } from 'app/entity/fbs/fbs-abnormal-working-hours';
+
+@Component({
+  selector: 'app-fbs-abnormal-working-hours-add',
+  templateUrl: './add.component.html',
+  styles: [
+    `
+    .base{
+      position: absolute;
+      bottom: 0px;
+      width: 100%;
+      border-top: 1px solid rgb(232, 232, 232);
+      padding: 10px 16px;
+      text-align: right;
+      left: 0px;
+      background: #fff;
+      z-index:99;
+    }
+
+    `
+  ]
+})
+export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
+
+  constructor(
+    private drawerRef:NzDrawerRef
+  ) { }
+
+  ngOnInit(): void {
+
+  }
+
+  saveLoading=false;//加载效果
+  fbsAbnormalWorkingHours:FbsAbnormalWorkingHours={}
+
+  /**
+   * 保存按钮
+   */
+  save(){
+
+  }
+
+  close() {
+    //抽屉关闭
+    this.drawerRef.close();
+  }
+}

src/app/routes/fbs-abnormal-working-hours/fbs-abnormal-working-hours-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { FbsAbnormalWorkingHoursListComponent } from './list/list.component';
+
+const routes: Routes = [
+
+  { path: 'list', component: FbsAbnormalWorkingHoursListComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class FbsAbnormalWorkingHoursRoutingModule { }

src/app/routes/fbs-abnormal-working-hours/fbs-abnormal-working-hours.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared';
+import { FbsAbnormalWorkingHoursRoutingModule } from './fbs-abnormal-working-hours-routing.module';
+import { FbsAbnormalWorkingHoursListComponent } from './list/list.component';
+import { FbsAbnormalWorkingHoursAddComponent } from './add/add.component';
+
+const COMPONENTS = [
+  FbsAbnormalWorkingHoursListComponent];
+const COMPONENTS_NOROUNT = [
+  FbsAbnormalWorkingHoursAddComponent];
+
+@NgModule({
+  imports: [
+    SharedModule,
+    FbsAbnormalWorkingHoursRoutingModule
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...COMPONENTS_NOROUNT
+  ],
+  entryComponents: COMPONENTS_NOROUNT
+})
+export class FbsAbnormalWorkingHoursModule { }

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

@@ -0,0 +1,50 @@
+<page-header [action]="phActionTpl">
+  <ng-template #phActionTpl>
+    <button (click)="add()" nz-button nzType="primary">新建</button>
+  </ng-template>
+</page-header>
+<nz-card>
+  <!-- 数据表 -->
+  <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
+    [nzFrontPagination]="false" #borderedTable [nzTotal]="page.total" [nzPageIndex]="page.current"
+    (nzPageIndexChange)="pageIndexChange($event)">
+    <thead>
+      <tr>
+        <th>姓名</th>
+        <th>日期</th>
+        <th>生产订单号</th>
+        <th>产品</th>
+        <th>任务数量</th>
+        <th>标准工时</th>
+        <th>计划开工时间</th>
+        <th>计划完工时间</th>
+        <th style="width:15%">{{ 'table.operation' | translate }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let item of  borderedTable.data">
+        <!-- <td >{{item.milestoneCode}}</td> -->
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>
+          <!-- 详情 -->
+          <a (click)="view(item)">{{ 'table.view' | translate }}</a>
+          <!-- 修改 -->
+          <span>&nbsp;|&nbsp;</span>
+          <a (click)="update(item)">{{ 'contract.index.update' | translate }}</a>
+          <!-- 删除 -->
+          <span>&nbsp;|&nbsp;</span>
+          <a nz-popconfirm nzTitle="是否删除" nzOkText="是" nzCancelText="否"
+            (nzOnConfirm)="delete(item)">{{ 'table.delete' | translate }}</a>
+
+        </td>
+      </tr>
+    </tbody>
+  </nz-table>
+</nz-card>

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

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FbsAbnormalWorkingHoursListComponent } from './list.component';
+
+describe('FbsAbnormalWorkingHoursListComponent', () => {
+  let component: FbsAbnormalWorkingHoursListComponent;
+  let fixture: ComponentFixture<FbsAbnormalWorkingHoursListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ FbsAbnormalWorkingHoursListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FbsAbnormalWorkingHoursListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,69 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { _HttpClient, ModalHelper } from '@delon/theme';
+import { STColumn, STComponent } from '@delon/abc';
+import { SFSchema } from '@delon/form';
+import { FbsAbnormalWorkingHours } from 'app/entity/fbs/fbs-abnormal-working-hours';
+import { FbsAbnormalWorkingHoursAddComponent } from '../add/add.component';
+import { NzDrawerService } from 'ng-zorro-antd';
+
+@Component({
+  selector: 'app-fbs-abnormal-working-hours-list',
+  templateUrl: './list.component.html',
+})
+export class FbsAbnormalWorkingHoursListComponent implements OnInit {
+ 
+
+  constructor(private nzDrawerService:NzDrawerService) { }
+
+  ngOnInit() { }
+
+  dataList = [{}]; //表格数据
+  isLoading = false; //表格加载
+  page = {
+    total: 0,
+    current: 0,
+    size: 0,
+  };
+
+  fbsAbnormalWorkingHours:FbsAbnormalWorkingHours={}
+  // 按页码查询
+  pageIndexChange(event) {
+    this.fbsAbnormalWorkingHours.pageNo = event;
+    //主数据刷新
+  }
+
+  /**
+   * 新增按钮
+   */
+  add() {
+    //打开新增抽屉
+    const drawerRef = this.nzDrawerService.create<FbsAbnormalWorkingHoursAddComponent>({
+      nzTitle: '新增生产异常信息统计单',
+      nzContent: FbsAbnormalWorkingHoursAddComponent,
+      nzWidth: window.innerWidth,
+      nzBodyStyle: { height: 'calc(100% - 55px)', overflow: 'auto', 'padding-bottom': '53px' },
+      nzContentParams: {},
+    });
+
+    //关闭抽屉的回调
+    drawerRef.afterClose.subscribe(isRefresh => {
+      if (isRefresh) {
+        //刷新list列表
+        // this.getPreList();
+      }
+    });
+  }
+
+  view(){
+
+  }
+
+  update(){
+
+  }
+
+  delete(){
+
+  }
+
+}

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

@@ -3,14 +3,14 @@
     <thead>
       <tr>
         <!-- 派工单 -->
-        <th colspan="4"><strong>派工单</strong></th>
+        <th colspan="4"><h2><strong>派工单</strong></h2></th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td style="width: 25%;">姓名</td>
         <td style="width: 25%;">
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.idU8" style="width: 100%;" nzShowSearch nzAllowClear
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择">
             <ng-container *ngFor="let proper of properList">
               <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>

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

@@ -3,14 +3,14 @@
     <thead>
       <tr>
         <!-- 派工单 -->
-        <th colspan="4"><strong>派工单</strong></th>
+        <th colspan="4"><h2><strong>派工单</strong></h2></th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td style="width: 25%;">姓名</td>
         <td style="width: 25%;">
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.idU8" style="width: 100%;" nzShowSearch nzAllowClear
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择">
             <ng-container *ngFor="let proper of properList">
               <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>

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

@@ -3,7 +3,7 @@
     <thead>
       <tr>
         <!-- 派工单 -->
-        <th colspan="4"><strong>派工单</strong></th>
+        <th colspan="4"><h2><strong>派工单</strong></h2></th>
       </tr>
     </thead>
     <tbody>

src/app/routes/routes-routing.module.ts

@@ -56,6 +56,8 @@ const routes: Routes = [
       { path: 'quality-management', loadChildren: './quality-management/quality-management.module#QualityManagementModule' },
       //车间派工单
       { path: 'WorkshopDispatchList', loadChildren: './fbs-workshop-dispatch-list/fbs-workshop-dispatch-list.module#FbsWorkshopDispatchListModule' },
+      //生产异常信息统计单
+      { path: 'FbsAbnormalWorkingHours', loadChildren: './fbs-abnormal-working-hours/fbs-abnormal-working-hours.module#FbsAbnormalWorkingHoursModule' },
     ],
   },
   // 全屏布局