派工单 人员档案 异常工时

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

@@ -61,6 +61,13 @@ export class FbsAbnormalWorkingHours extends Page{
 	workshopDispatchListId?:string;
 	rejectsNumber?:string;
 
+	/**应到人数*/
+	numberOfPeopleToArrive?:number;
+	/**实到人数*/
+	actualNumberOfPeople?:number;
+	/**出勤工时*/
+	attendanceHours?:number;
+
 	//类型id
 	typeId?:string;
 	//类型名称

src/app/entity/fbs/fbs-personnel.ts

@@ -0,0 +1,8 @@
+import { Page } from '../page';
+
+export class FbsPersonnel  extends Page{
+  /**人员编码*/
+	personnelCode?:string;
+	/**人员名称*/
+	personnelName?:string;
+}

src/app/entity/fbs/fbs-quality-qualification-rate.ts

@@ -17,4 +17,17 @@ export class FbsQualityQualificationRate extends Page{
 	fiveMonth?:string;
 	/**第六个月*/
 	sixMonth?:string;
+	/**第一个月*/
+	
+	oneMonthName?:string;
+	/**第二个月*/
+	twoMonthName?:string;
+	/**第三个月*/
+	threeMonthName?:string;
+	/**第四个月*/
+	fourMonthName?:string;
+	/**第五个月*/
+	fiveMonthName?:string;
+	/**第六个月*/
+	sixMonthName?:string;
 }

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

@@ -5,13 +5,13 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="7">
-          <h2><strong>异常工时信息统计单</strong></h2>
+          <h2><strong>生产异常信息统计单</strong></h2>
         </th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td style="width: 25%;">姓名</td>
+        <!-- <td style="width: 25%;">姓名</td>
         <td style="width: 25%;" colSpan="2">
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
@@ -19,12 +19,31 @@
               <nz-option  [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
-        </td>
+        </td> -->
         <td style="width: 25%;" colSpan="2">日期</td>
         <td style="width: 25%;" colspan="2">
           <nz-date-picker [(ngModel)]="fbsAbnormalWorkingHours.date" nzPlaceHolder="请选择" nzDisabled>
           </nz-date-picker>
         </td>
+        <td colSpan="3"></td>
+      </tr>
+      <tr>
+        <td>出勤记录</td>
+        <td>应到人数</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.numberOfPeopleToArrive" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td>实到人数</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.actualNumberOfPeople" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td>出勤工时</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.attendanceHours" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
       </tr>
       <tr>
         <td>加班记录</td>
@@ -101,7 +120,7 @@
         </td>
       </tr>
       <tr>
-        <td>改善措施</td>
+        <!-- <td>改善措施</td>
         <td>当日派工产品</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.productId" style="width: 100%;" nzShowSearch
@@ -112,7 +131,7 @@
           </nz-select>
         </td>
         <td>不良品数量</td>
-        <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+        <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td> -->
         <!-- <td>异常类别</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
@@ -142,23 +161,35 @@
         <nz-table style="margin-top: 5px;" nzSize="small" #editRowTable nzBordered [nzData]="describeList" [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="10%">序号</th>
-              <th nzWidth="80%">异常原因描述</th>
-              <th nzWidth="10%">异常类别</th>
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="15%">产品</th>
+              <th nzWidth="10%">不良品数量</th>
+              <th nzWidth="45%">异常原因描述</th>
+              <th nzWidth="15%">异常类别</th>
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>
+                <nz-select [(ngModel)]="data.productId" style="width: 100%;" nzShowSearch
+                  nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event,data)">
+                  <ng-container *ngFor="let produc of productList">
+                    <nz-option [nzLabel]="produc.product" [nzValue]="produc.productId"> </nz-option>
+                  </ng-container>
+                </nz-select>
+              </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>
-                <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
+                <!-- <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
                   nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event,data)">
                   <ng-container *ngFor="let type of typeListSelect">
                     <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
                   </ng-container>
-                </nz-select>
+                </nz-select> -->
+                <input nz-input name="data.typeName" [(ngModel)]="data.typeName" />
               </td>
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>

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

@@ -84,12 +84,12 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
   /**
    * 产品选择事件（获取产品名称、派工id）
    */
-  productChange(event){
+  productChange(event,data){
     if(event){
       this.productList.forEach(element => {
         if(event===element.productId){
-          this.fbsAbnormalWorkingHours.workshopDispatchListId=element.id;//派工单id
-          this.fbsAbnormalWorkingHours.product=element.product;//产品名称
+          data.workshopDispatchListId=element.id;//派工单id
+          data.product=element.product;//产品名称
         }
       });
     }
@@ -175,7 +175,7 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
     //时间格式化
     this.fbsAbnormalWorkingHours.date=this.datePipe.transform(this.fbsAbnormalWorkingHours.date, 'yyyy-MM-dd HH:mm:ss');
     this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList=this.describeList;//获取异常工时描述
-    this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursTypeList=this.typeList;//获取异常工时类别
+    // this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursTypeList=this.typeList;//获取异常工时类别
     this.fbsAbnormalWorkingHoursService.addAndChild(this.fbsAbnormalWorkingHours).then((response)=>{
       if(response.success){//保存成功
         this.nzNotificationService.success("保存成功","");

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

@@ -8,7 +8,7 @@
     <!-- 查询条件 -->
     <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="8">
         <nz-form-item class="nz-form-item">
           <nz-form-label [nzSpan]="8">姓名</nz-form-label>
           <nz-form-control [nzSpan]="16">
@@ -16,7 +16,7 @@
               placeholder="请输入" />
           </nz-form-control>
         </nz-form-item>
-      </div>
+      </div> -->
       <!-- 按钮 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
@@ -35,7 +35,7 @@
     (nzPageIndexChange)="pageIndexChange($event)">
     <thead>
       <tr>
-        <th>姓名</th>
+        <!-- <th>姓名</th> -->
         <th>日期</th>
         <th>加班工时</th>
         <th>培训</th>
@@ -50,7 +50,7 @@
     <tbody>
       <tr *ngFor="let item of  borderedTable.data">
         <!-- <td >{{item.milestoneCode}}</td> -->
-        <td>{{item.name}}</td>
+        <!-- <td>{{item.name}}</td> -->
         <td>{{item.date}}</td>
         <td>{{item.overtimeHours}}</td>
         <td>{{item.train}}</td>

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

@@ -5,26 +5,45 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="7">
-          <h2><strong>异常工时信息统计单</strong></h2>
+          <h2><strong>生产异常信息统计单</strong></h2>
         </th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td style="width: 25%;">姓名</td>
+        <!-- <td style="width: 25%;">姓名</td>
         <td style="width: 25%;" colSpan="2">
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
             <ng-container *ngFor="let proper of properList">
-              <nz-option [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
+              <nz-option  [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
-        </td>
+        </td> -->
         <td style="width: 25%;" colSpan="2">日期</td>
         <td style="width: 25%;" colspan="2">
-          <nz-date-picker [(ngModel)]="fbsAbnormalWorkingHours.date" nzPlaceHolder="请选择">
+          <nz-date-picker [(ngModel)]="fbsAbnormalWorkingHours.date" nzPlaceHolder="请选择" nzDisabled>
           </nz-date-picker>
         </td>
+        <td colSpan="3"></td>
+      </tr>
+      <tr>
+        <td>出勤记录</td>
+        <td>应到人数</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.numberOfPeopleToArrive" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td>实到人数</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.actualNumberOfPeople" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
+        <td>出勤工时</td>
+        <td>
+          <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.attendanceHours" [nzMin]="0" [nzStep]="1">
+          </nz-input-number>
+        </td>
       </tr>
       <tr>
         <td>加班记录</td>
@@ -101,7 +120,7 @@
         </td>
       </tr>
       <tr>
-        <td>改善措施</td>
+        <!-- <td>改善措施</td>
         <td>当日派工产品</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.productId" style="width: 100%;" nzShowSearch
@@ -112,9 +131,7 @@
           </nz-select>
         </td>
         <td>不良品数量</td>
-        <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
-        <td></td>
-        <td></td>
+        <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td> -->
         <!-- <td>异常类别</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
@@ -130,7 +147,7 @@
   </nz-table>
 
   <!-- 子表数据 -->
-  <div nz-row nzGutter="24">
+  <div nz-row nzGutter="24" >
     <!-- 异常原因描述 -->
     <div nz-col nzMd="24" nzLg="24">
       <nz-card nzTitle="异常原因描述">
@@ -144,23 +161,35 @@
         <nz-table style="margin-top: 5px;" nzSize="small" #editRowTable nzBordered [nzData]="describeList" [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="10%">序号</th>
-              <th nzWidth="70%">异常原因描述</th>
-              <th nzWidth="10%">异常类别</th>
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="15%">产品</th>
+              <th nzWidth="10%">不良品数量</th>
+              <th nzWidth="45%">异常原因描述</th>
+              <th nzWidth="15%">异常类别</th>
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>
+                <nz-select [(ngModel)]="data.productId" style="width: 100%;" nzShowSearch
+                  nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event,data)">
+                  <ng-container *ngFor="let produc of productList">
+                    <nz-option [nzLabel]="produc.product" [nzValue]="produc.productId"> </nz-option>
+                  </ng-container>
+                </nz-select>
+              </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>
-                <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
+                <!-- <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
                   nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event,data)">
                   <ng-container *ngFor="let type of typeListSelect">
                     <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
                   </ng-container>
-                </nz-select>
+                </nz-select> -->
+                <input nz-input name="data.typeName" [(ngModel)]="data.typeName" />
               </td>
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>

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

@@ -41,12 +41,15 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
     this.getProperList();
     this.getTypeList();
     this.getById()
+    // .then(()=>{
+    //   this.saveLoading = false;
+    // })
       .then(() => {
         return this.getDescribeListById();
       })
-      .then(() => {
-        return this.getTypeById();
-      })
+      // .then(() => {
+      //   return this.getTypeById();
+      // })
       .then(() => {
         return this.getProductList();
       })
@@ -153,12 +156,12 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
   /**
    * 产品选择事件（获取产品名称、派工id）
    */
-  productChange(event) {
-    if (event) {
+  productChange(event,data){
+    if(event){
       this.productList.forEach(element => {
-        if (event === element.productId) {
-          this.fbsAbnormalWorkingHours.workshopDispatchListId = element.id; //派工单id
-          this.fbsAbnormalWorkingHours.product = element.product; //产品名称
+        if(event===element.productId){
+          data.workshopDispatchListId=element.id;//派工单id
+          data.product=element.product;//产品名称
         }
       });
     }
@@ -246,7 +249,7 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
       'yyyy-MM-dd HH:mm:ss',
     );
     this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList = this.describeList; //获取异常工时描述
-    this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursTypeList = this.typeList; //获取异常工时类别
+    // this.fbsAbnormalWorkingHours.fbsAbnormalWorkingHoursTypeList = this.typeList; //获取异常工时类别
     this.fbsAbnormalWorkingHoursService.updateAndChild(this.fbsAbnormalWorkingHours).then(response => {
       if (response.success) {
         //保存成功

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

@@ -5,20 +5,36 @@
       <tr>
         <!-- 异常工时信息统计单 -->
         <th colspan="7">
-          <h2><strong>异常工时信息统计单</strong></h2>
+          <h2><strong>生产异常信息统计单</strong></h2>
         </th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td style="width: 25%;">姓名</td>
+        <!-- <td style="width: 25%;">姓名</td>
         <td style="width: 25%;" colSpan="2">
           {{fbsAbnormalWorkingHours.name}}
-        </td>
+        </td> -->
         <td style="width: 25%;" colSpan="2">日期</td>
         <td style="width: 25%;" colspan="2">
           {{fbsAbnormalWorkingHours.date}}
         </td>
+        <td colSpan="3"></td>
+      </tr>
+      <tr>
+        <td>出勤记录</td>
+        <td>应到人数</td>
+        <td>
+         {{fbsAbnormalWorkingHours.numberOfPeopleToArrive}}
+        </td>
+        <td>实到人数</td>
+        <td>
+          {{fbsAbnormalWorkingHours.actualNumberOfPeople}}
+        </td>
+        <td>出勤工时</td>
+        <td>
+          {{fbsAbnormalWorkingHours.attendanceHours}}
+        </td>
       </tr>
       <tr>
         <td>加班记录</td>
@@ -92,7 +108,7 @@
           {{fbsAbnormalWorkingHours.plan}}
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td>改善措施</td>
         <td>当日派工产品</td>
         <td>
@@ -100,17 +116,13 @@
         </td>
         <td>不良品数量</td>
         <td>{{fbsAbnormalWorkingHours.rejectsNumber}}</td>
-        <!-- <td>异常类别</td>
-        <td>
-          {{fbsAbnormalWorkingHours.typeName}}
-        </td> -->
-      </tr>
+      </tr> -->
       <tr></tr>
     </tbody>
   </nz-table>
 
   <!-- 子表数据 -->
-  <div nz-row nzGutter="24">
+  <div nz-row nzGutter="24" >
     <!-- 异常原因描述 -->
     <div nz-col nzMd="24" nzLg="24">
       <nz-card nzTitle="异常原因描述">
@@ -118,14 +130,19 @@
         <nz-table style="margin-top: 5px;" nzSize="small" #editRowTable nzBordered [nzData]="describeList" [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="10%">序号</th>
-              <th nzWidth="80%">异常原因描述</th>
-              <th nzWidth="10%">异常类别</th>
+              <th nzWidth="5%">序号</th>
+              <th nzWidth="15%">产品</th>
+              <th nzWidth="10%">不良品数量</th>
+              <th nzWidth="45%">异常原因描述</th>
+              <th nzWidth="15%">异常类别</th>
+              <!-- <th nzWidth="10%">操作</th> -->
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>{{data.product}}</td>
+              <td>{{data.rejectsNumber}}</td>
               <td>{{data.describes}}</td>
               <td>{{data.typeName}}</td>
             </tr>

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

@@ -35,11 +35,17 @@ export class FbsAbnormalWorkingHoursViewComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.getById().then(()=>{
+    this.getById()
+    // .then(()=>{
+    //   this.saveLoading = false;
+    // })
+    .then(()=>{
       return this.getDescribeListById()
-    }).then(()=>{
-      return this.getTypeById();
-    }).then(()=>{
+    })
+    // .then(()=>{
+    //   return this.getTypeById();
+    // })
+    .then(()=>{
       this.saveLoading=false;
     })
   }

src/app/routes/fbs-personnel/add/add.component.html

@@ -0,0 +1,16 @@
+<nz-spin [nzSpinning]="saveLoading">
+  <form nz-form>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="6" >人员编码</nz-form-label>
+      <nz-form-control [nzSpan]="16">
+        <input nz-input name="fbsPersonnel.personnelCode" [(ngModel)]="fbsPersonnel.personnelCode" />
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="6" >人员名称</nz-form-label>
+      <nz-form-control [nzSpan]="16">
+        <input nz-input name="fbsPersonnel.personnelName" [(ngModel)]="fbsPersonnel.personnelName" />
+      </nz-form-control>
+    </nz-form-item>
+    </form>
+  </nz-spin>

src/app/routes/fbs-personnel/add/add.component.spec.ts

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

src/app/routes/fbs-personnel/add/add.component.ts

@@ -0,0 +1,47 @@
+import { Component, OnInit } from '@angular/core';
+import { NzModalRef, NzMessageService, NzNotificationService } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { FbsPersonnel } from 'app/entity/fbs/fbs-personnel';
+import { FbsPersonnelService } from 'app/services/fbs/fbs-personnel.service';
+import { resolve } from 'url';
+
+@Component({
+  selector: 'app-fbs-personnel-add',
+  templateUrl: './add.component.html',
+})
+export class FbsPersonnelAddComponent implements OnInit {
+
+
+  constructor(
+    private modal: NzModalRef,
+    private fbsPersonnelService:FbsPersonnelService,
+    private nzNotificationService:NzNotificationService
+  ) { }
+  saveLoading=false;
+  fbsPersonnel:FbsPersonnel={}
+
+  ngOnInit(): void {
+    
+  }
+
+  save(){
+    return new Promise(resolve => {
+      this.fbsPersonnelService.add(this.fbsPersonnel).then((response)=>{
+        if(response.success){//保存成功
+          this.nzNotificationService.success("保存成功","");
+          this.saveLoading=false;//加载效果关闭
+          this.modal.destroy();
+          resolve();
+        }else{//保存失败
+          this.nzNotificationService.error("保存失败",response.message);
+          this.saveLoading=false;//加载效果关闭
+        }
+      })
+    })
+  }
+
+
+  close() {
+    this.modal.destroy();
+  }
+}

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

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

src/app/routes/fbs-personnel/fbs-personnel.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared';
+import { FbsPersonnelRoutingModule } from './fbs-personnel-routing.module';
+import { FbsPersonnelListComponent } from './list/list.component';
+import { FbsPersonnelAddComponent } from './add/add.component';
+import { FbsPersonnelUpdateComponent } from './update/update.component';
+
+const COMPONENTS = [
+  FbsPersonnelListComponent];
+const COMPONENTS_NOROUNT = [
+  FbsPersonnelAddComponent,
+  FbsPersonnelUpdateComponent];
+
+@NgModule({
+  imports: [
+    SharedModule,
+    FbsPersonnelRoutingModule
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...COMPONENTS_NOROUNT
+  ],
+  entryComponents: COMPONENTS_NOROUNT
+})
+export class FbsPersonnelModule { }

src/app/routes/fbs-personnel/list/list.component.html

@@ -0,0 +1,31 @@
+<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 style="width:15%">人员编码</th>
+        <th style="width:70%">人员名称</th>
+        <th style="width:15%">操作</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let item of  borderedTable.data">
+        <td>{{item.personnelCode}}</td>
+        <td>{{item.personnelName}}</td>
+        <td>
+          <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>
+    </nz-table>
+</nz-card>

src/app/routes/fbs-personnel/list/list.component.spec.ts

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

src/app/routes/fbs-personnel/list/list.component.ts

@@ -0,0 +1,139 @@
+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 { NzModalRef, NzModalService, NzNotificationService } from 'ng-zorro-antd';
+import { FbsPersonnelAddComponent } from '../add/add.component';
+import { FbsPersonnel } from 'app/entity/fbs/fbs-personnel';
+import { FbsPersonnelService } from 'app/services/fbs/fbs-personnel.service';
+import { FbsPersonnelUpdateComponent } from '../update/update.component';
+
+@Component({
+  selector: 'app-fbs-personnel-list',
+  templateUrl: './list.component.html',
+})
+export class FbsPersonnelListComponent implements OnInit {
+  
+
+  constructor(
+    private nzModalService:NzModalService,
+    private fbsPersonnelService:FbsPersonnelService,
+    private nzNotificationService:NzNotificationService
+  ) { }
+
+  ngOnInit() {
+    this.getList();
+   }
+
+  dataList = []; //表格数据
+  isLoading = false; //表格加载
+  page = {
+    total: 0,
+    current: 0,
+    size: 0,
+  };
+
+  ffbsPersonnel:FbsPersonnel={}
+  // 按页码查询
+  pageIndexChange(event) {
+    this.ffbsPersonnel.pageNo = event;
+    //主数据刷新
+  }
+
+  add() {
+    const modal = this.nzModalService.create({
+      nzTitle: '新增',
+      nzWidth: "50%",
+      nzContent: FbsPersonnelAddComponent,
+      nzFooter: [
+        {
+          //取消
+          label: "取消",
+          type: 'default',
+          onClick: model => {
+            model.close();
+          },
+        },
+        {
+          label: '保存',
+          type: 'primary',
+          onClick: model=> {
+            model.save().then(()=>{
+              this.getList()
+            })
+          }
+        }
+      ]
+    });
+  }
+
+
+  update(item) {
+    const modal = this.nzModalService.create({
+      nzTitle: '修改',
+      nzWidth: "50%",
+      nzContent: FbsPersonnelUpdateComponent,
+      nzComponentParams: {
+        id: item.id
+      },
+      nzFooter: [
+        {
+          //取消
+          label: "取消",
+          type: 'default',
+          onClick: model => {
+            model.close();
+          },
+        },
+        {
+          label: '保存',
+          type: 'primary',
+          onClick: model=> {
+            model.save().then(()=>{
+              this.getList()
+            })
+          }
+        }
+      ]
+    });
+  }
+
+  delete(item){
+    this.isLoading=true;
+    this.fbsPersonnelService.delete(item.id).then((response)=>{
+      if(response.success){
+        this.nzNotificationService.success("删除成功","");
+        //刷新list列表
+        this.getList();
+        this.isLoading=false;
+      }else{
+        this.nzNotificationService.success("删除失败",response.message);
+        this.isLoading=false;
+      }
+    })
+  }
+
+  /**
+   * 查询主数据
+   */
+  getList(){
+    this.isLoading=true;
+    this.fbsPersonnelService.list(this.ffbsPersonnel).then((response)=>{
+      if(response.success){//查询成功
+        this.dataList=response.result.records;//表格数据
+        this.page=response.result;//分页数据
+        this.isLoading=false;
+      }
+    })
+  }
+
+  /**
+   * 查询按钮
+   */
+  query(){
+    this.ffbsPersonnel.pageNo=1;
+    //主数据刷新
+    this.getList();
+  }
+
+}

src/app/routes/fbs-personnel/update/update.component.html

@@ -0,0 +1,16 @@
+<nz-spin [nzSpinning]="saveLoading">
+  <form nz-form>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="6" >人员编码</nz-form-label>
+      <nz-form-control [nzSpan]="16">
+        <input nz-input name="fbsPersonnel.personnelCode" [(ngModel)]="fbsPersonnel.personnelCode" />
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSpan]="6" >人员名称</nz-form-label>
+      <nz-form-control [nzSpan]="16">
+        <input nz-input name="fbsPersonnel.personnelName" [(ngModel)]="fbsPersonnel.personnelName" />
+      </nz-form-control>
+    </nz-form-item>
+    </form>
+  </nz-spin>

src/app/routes/fbs-personnel/update/update.component.spec.ts

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

src/app/routes/fbs-personnel/update/update.component.ts

@@ -0,0 +1,50 @@
+import { Component, OnInit } from '@angular/core';
+import { NzModalRef, NzMessageService, NzNotificationService } from 'ng-zorro-antd';
+import { _HttpClient } from '@delon/theme';
+import { FbsPersonnel } from 'app/entity/fbs/fbs-personnel';
+import { FbsPersonnelService } from 'app/services/fbs/fbs-personnel.service';
+
+@Component({
+  selector: 'app-fbs-personnel-update',
+  templateUrl: './update.component.html',
+})
+export class FbsPersonnelUpdateComponent implements OnInit {
+  constructor(
+    private modal: NzModalRef,
+    private fbsPersonnelService:FbsPersonnelService,
+    private nzNotificationService:NzNotificationService
+  ) { }
+  saveLoading=false;
+  fbsPersonnel:FbsPersonnel={}
+  id="";
+  ngOnInit(): void {
+    this.getById();
+  }
+
+  getById(){
+    this.fbsPersonnelService.getById(this.id).then((response)=>{
+      this.fbsPersonnel=response.result
+    })
+  }
+
+  save(){
+    return new Promise(resolve => {
+      this.fbsPersonnelService.edit(this.fbsPersonnel).then((response)=>{
+        if(response.success){//保存成功
+          this.nzNotificationService.success("保存成功","");
+          this.saveLoading=false;//加载效果关闭
+          this.modal.destroy();
+          resolve();
+        }else{//保存失败
+          this.nzNotificationService.error("保存失败",response.message);
+          this.saveLoading=false;//加载效果关闭
+        }
+      })
+    })
+  }
+
+
+  close() {
+    this.modal.destroy();
+  }
+}

src/app/routes/fbs-quality-qualification-rate/list/list.component.html

@@ -9,42 +9,69 @@
     <nz-form-item>
       <nz-form-label [nzSpan]="2" >刻度线百分比</nz-form-label>
       <nz-form-control [nzSpan]="5">
-        <nz-input-number name="fbsQualityQualificationRate.scaleMark" [(ngModel)]="fbsQualityQualificationRate.scaleMark" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.scaleMark" [(ngModel)]="fbsQualityQualificationRate.scaleMark" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSpan]="2" >第一个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" >百分比</nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.oneMonth" [(ngModel)]="fbsQualityQualificationRate.oneMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.oneMonth" [(ngModel)]="fbsQualityQualificationRate.oneMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
-      <nz-form-label [nzSpan]="2" >第二个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.twoMonth" [(ngModel)]="fbsQualityQualificationRate.twoMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.twoMonth" [(ngModel)]="fbsQualityQualificationRate.twoMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
-      <nz-form-label [nzSpan]="2" >第三个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.threeMonth" [(ngModel)]="fbsQualityQualificationRate.threeMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.threeMonth" [(ngModel)]="fbsQualityQualificationRate.threeMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
-      <nz-form-label [nzSpan]="2" >第四个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.fourMonth" [(ngModel)]="fbsQualityQualificationRate.fourMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.fourMonth" [(ngModel)]="fbsQualityQualificationRate.fourMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
-      <nz-form-label [nzSpan]="2" >第五个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.fiveMonth" [(ngModel)]="fbsQualityQualificationRate.fiveMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.fiveMonth" [(ngModel)]="fbsQualityQualificationRate.fiveMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
-      <nz-form-label [nzSpan]="2" >第六个月</nz-form-label>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">
-        <nz-input-number name="fbsQualityQualificationRate.sixMonth" [(ngModel)]="fbsQualityQualificationRate.sixMonth" [nzMin]="1" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
+        <nz-input-number name="fbsQualityQualificationRate.sixMonth" [(ngModel)]="fbsQualityQualificationRate.sixMonth" [nzMin]="0" [nzMax]="100" [nzStep]="1" [nzFormatter]="formatterPercent"
           [nzParser]="parserPercent"></nz-input-number>
       </nz-form-control>
     </nz-form-item>
+    
+    <nz-form-item>
+      <nz-form-label [nzSpan]="2" >月份</nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.oneMonthName" [(ngModel)]="fbsQualityQualificationRate.oneMonthName" />
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.twoMonthName" [(ngModel)]="fbsQualityQualificationRate.twoMonthName" />
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.threeMonthName" [(ngModel)]="fbsQualityQualificationRate.threeMonthName" />
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.fourMonthName" [(ngModel)]="fbsQualityQualificationRate.fourMonthName" />
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.fiveMonthName" [(ngModel)]="fbsQualityQualificationRate.fiveMonthName" />
+      </nz-form-control>
+      <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
+      <nz-form-control [nzSpan]="2">
+        <input nz-input name="fbsQualityQualificationRate.sixMonthName" [(ngModel)]="fbsQualityQualificationRate.sixMonthName" />
+      </nz-form-control>
+    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
       <nz-form-control [nzSpan]="2">

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

@@ -60,6 +60,8 @@ const routes: Routes = [
       { path: 'FbsAbnormalWorkingHours', loadChildren: './fbs-abnormal-working-hours/fbs-abnormal-working-hours.module#FbsAbnormalWorkingHoursModule' },
       //质量近六个月统计
       { path: 'fbs-quality-qualification-rate', loadChildren: './fbs-quality-qualification-rate/fbs-quality-qualification-rate.module#FbsQualityQualificationRateModule' },
+      //质量近六个月统计
+      { path: 'fbs-personnel', loadChildren: './fbs-personnel/fbs-personnel.module#FbsPersonnelModule' },
     ],
   },
   // 全屏布局

src/app/services/fbs/fbs-personnel.service.spec.ts

@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FbsPersonnelService } from './fbs-personnel.service';
+
+describe('FbsPersonnelService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: FbsPersonnelService = TestBed.get(FbsPersonnelService);
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/fbs/fbs-personnel.service.ts

@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { BaseResponse } from 'app/entity/baseResponse';
+import { Result } from 'app/entity/Result';
+import { FbsPersonnel } from 'app/entity/fbs/fbs-personnel';
+import { HttpClient } from '@angular/common/http';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FbsPersonnelService {
+
+  constructor(private http:HttpClient) { }
+
+  // 查询
+  async list(body:any): Promise<BaseResponse<Result<FbsPersonnel[]>>> {
+    return await this.http.get<BaseResponse<Result<FbsPersonnel[]>>>('/fbsBasedate/fbsPersonnel/list',{params:body}).toPromise();
+  }
+
+  // 新增
+  async add(body: FbsPersonnel): Promise<BaseResponse<FbsPersonnel>> {
+    return await this.http.post<BaseResponse<FbsPersonnel>>('/fbsBasedate/fbsPersonnel/add', body).toPromise();
+  }
+
+  // 修改
+  async edit(body: FbsPersonnel): Promise<BaseResponse<FbsPersonnel>> {
+    return await this.http.put<BaseResponse<FbsPersonnel>>('/fbsBasedate/fbsPersonnel/edit', body).toPromise();
+  }
+
+  // 通过id删除
+  async delete(id: string): Promise<BaseResponse<FbsPersonnel>> {
+    return await this.http.delete<BaseResponse<FbsPersonnel>>('/fbsBasedate/fbsPersonnel/delete', { params: { id: id } }).toPromise();
+  }
+
+   // 根据id查询
+   async getById(id: string): Promise<BaseResponse<FbsPersonnel>> {
+    return await this.http.get<BaseResponse<FbsPersonnel>>("/fbsBasedate/fbsPersonnel/queryById", { params: { id: id } }).toPromise();
+  }
+}