派工单

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

@@ -61,6 +61,10 @@ export class FbsAbnormalWorkingHours extends Page{
 	workshopDispatchListId?:string;
 	rejectsNumber?:string;
 
+	//类型id
+	typeId?:string;
+	//类型名称
+	typeName?:string;;
 
 	//异常工时描述集合
 	fbsAbnormalWorkingHoursDescribeList?:any[];

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

@@ -113,8 +113,15 @@
         </td>
         <td>不良品数量</td>
         <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
-        <td></td>
-        <td></td>
+        <td>异常类别</td>
+        <td>
+          <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
+            nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event)">
+            <ng-container *ngFor="let type of typeListSelect">
+              <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
+            </ng-container>
+          </nz-select>
+        </td>
       </tr>
       <tr></tr>
     </tbody>
@@ -123,7 +130,7 @@
   <!-- 子表数据 -->
   <div nz-row nzGutter="24">
     <!-- 异常原因描述 -->
-    <div nz-col nzMd="24" nzLg="12">
+    <div nz-col nzMd="24" nzLg="24">
       <nz-card nzTitle="异常原因描述">
         <!-- 按钮 -->
         <div nz-row [nzGutter]="24">
@@ -152,15 +159,13 @@
     </div>
 
     <!-- 异常类型 -->
-    <div nz-col nzMd="24" nzLg="12">
+    <!-- <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" [nzFrontPagination]=false>
           <thead>
             <tr>
@@ -178,7 +183,7 @@
           </tbody>
         </nz-table>
       </nz-card>
-    </div>
+    </div> -->
 
   </div>
 </nz-spin>

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

@@ -39,6 +39,7 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
   ngOnInit(): void {
     this.getProperList();
     this.getProductList();
+    this.getTypeList();
   }
 
   saveLoading=false;//加载效果
@@ -94,6 +95,30 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
     }
   }
 
+  /**
+   * 获取类型集合
+   */
+  typeListSelect=[];
+  getTypeList(){
+    let page={pageSize:1000}
+    this.fbsAbnormalWorkingHoursService.typelist(page).then((response)=>{
+      this.typeListSelect=response.result.records;
+    })
+  }
+
+  /**
+   * 类型选择事件 （获取类型名称）
+   */
+  typeChange(event){
+    if(event){
+      this.typeListSelect.forEach(element => {
+        if(element.id===event){
+          this.fbsAbnormalWorkingHours.typeName=element.typeName;
+        }
+      });
+    }
+  }
+
   describeList=[];//异常描述集合表格数据
   /**
    * 描述增加行按钮

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

@@ -113,8 +113,15 @@
         </td>
         <td>不良品数量</td>
         <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
-        <td></td>
-        <td></td>
+        <td>异常类别</td>
+        <td>
+          <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
+            nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event)">
+            <ng-container *ngFor="let type of typeListSelect">
+              <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
+            </ng-container>
+          </nz-select>
+        </td>
       </tr>
       <tr></tr>
     </tbody>
@@ -123,7 +130,7 @@
   <!-- 子表数据 -->
   <div nz-row nzGutter="24">
     <!-- 异常原因描述 -->
-    <div nz-col nzMd="24" nzLg="12">
+    <div nz-col nzMd="24" nzLg="24">
       <nz-card nzTitle="异常原因描述">
         <!-- 按钮 -->
         <div nz-row [nzGutter]="24">
@@ -152,15 +159,13 @@
     </div>
 
     <!-- 异常类型 -->
-    <div nz-col nzMd="24" nzLg="12">
+    <!-- <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" [nzFrontPagination]=false>
           <thead>
             <tr>
@@ -178,7 +183,7 @@
           </tbody>
         </nz-table>
       </nz-card>
-    </div>
+    </div> -->
 
   </div>
 </nz-spin>

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

@@ -39,6 +39,7 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
 
   ngOnInit(): void {
     this.getProperList();
+    this.getTypeList();
     this.getById()
       .then(() => {
         return this.getDescribeListById();
@@ -163,6 +164,30 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
     }
   }
 
+  /**
+   * 获取类型集合
+   */
+  typeListSelect=[];
+  getTypeList(){
+    let page={pageSize:1000}
+    this.fbsAbnormalWorkingHoursService.typelist(page).then((response)=>{
+      this.typeListSelect=response.result.records;
+    })
+  }
+
+  /**
+   * 类型选择事件 （获取类型名称）
+   */
+  typeChange(event){
+    if(event){
+      this.typeListSelect.forEach(element => {
+        if(element.id===event){
+          this.fbsAbnormalWorkingHours.typeName=element.typeName;
+        }
+      });
+    }
+  }
+
   describeList = []; //异常描述集合表格数据
   /**
    * 描述增加行按钮

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

@@ -100,8 +100,10 @@
         </td>
         <td>不良品数量</td>
         <td>{{fbsAbnormalWorkingHours.rejectsNumber}}</td>
-        <td></td>
-        <td></td>
+        <td>异常类别</td>
+        <td>
+          {{fbsAbnormalWorkingHours.typeName}}
+        </td>
       </tr>
       <tr></tr>
     </tbody>
@@ -110,7 +112,7 @@
   <!-- 子表数据 -->
   <div nz-row nzGutter="24">
     <!-- 异常原因描述 -->
-    <div nz-col nzMd="24" nzLg="12">
+    <div nz-col nzMd="24" nzLg="24">
       <nz-card nzTitle="异常原因描述">
         <!-- 表格 -->
         <nz-table style="margin-top: 5px;" nzSize="small" #editRowTable nzBordered [nzData]="describeList" [nzShowPagination]="false" [nzFrontPagination]=false>
@@ -130,26 +132,6 @@
       </nz-card>
     </div>
 
-    <!-- 异常类型 -->
-    <div nz-col nzMd="24" nzLg="12">
-      <nz-card nzTitle="异常类别">
-        <!-- 表格 -->
-        <nz-table style="margin-top: 5px;" nzSize="small" #typeTable nzBordered [nzData]="typeList" [nzShowPagination]="false" [nzFrontPagination]=false>
-          <thead>
-            <tr>
-              <th nzWidth="10%">序号</th>
-              <th nzWidth="90%">异常类型</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>

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

@@ -49,7 +49,7 @@
         <td>任务数量</td>
         <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.numberOfTasks" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
         <td>标准工时</td>
-        <td>{{fbsWorkshopDispatchList.standardWorkingHours}}</td>
+        <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.standardWorkingHours" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
       </tr>
       <tr>
         <td>计划开工时间</td>

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

@@ -49,7 +49,7 @@
         <td>任务数量</td>
         <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.numberOfTasks" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
         <td>标准工时</td>
-        <td>{{fbsWorkshopDispatchList.standardWorkingHours}}</td>
+        <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.standardWorkingHours" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
       </tr>
       <tr>
         <td>计划开工时间</td>

src/app/services/fbs/fbs-abnormal-working-hours.service.ts

@@ -21,6 +21,11 @@ export class FbsAbnormalWorkingHoursService {
     return await this.http.get<BaseResponse<Result<FbsAbnormalWorkingHours[]>>>('/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/list',{params:body}).toPromise();
   }
 
+  // 异常类别查询
+  async typelist(body:any): Promise<BaseResponse<Result<FbsAbnormalWorkingHours[]>>> {
+    return await this.http.get<BaseResponse<Result<FbsAbnormalWorkingHours[]>>>('/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursType/list',{params:body}).toPromise();
+  }
+
   // 新增
   async add(body: FbsAbnormalWorkingHours): Promise<BaseResponse<FbsAbnormalWorkingHours>> {
     return await this.http.post<BaseResponse<FbsAbnormalWorkingHours>>('/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/add', body).toPromise();