11

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

@@ -12,4 +12,8 @@ export class FbsAbnormalWorkingHoursDescribe extends Page {
   describes?: string;
   /**备注*/
   memo?: string;
+  //类型id
+	typeId?:string;
+	//类型名称
+	typeName?:string;;
 }

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

@@ -33,6 +33,8 @@ export class FbsWorkshopDispatchList extends Page{
 	productionLineName?:string;
 	/**生产线id */
 	productionLineId?:string;
+	/**项目名称 */
+	projectName?:string;
 
 	
 	fbsWorkshopDispatchListList?:FbsWorkshopDispatchList[]

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

@@ -113,7 +113,7 @@
         </td>
         <td>不良品数量</td>
         <td><nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
-        <td>异常类别</td>
+        <!-- <td>异常类别</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event)">
@@ -121,7 +121,7 @@
               <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
             </ng-container>
           </nz-select>
-        </td>
+        </td> -->
       </tr>
       <tr></tr>
     </tbody>
@@ -144,6 +144,7 @@
             <tr>
               <th nzWidth="10%">序号</th>
               <th nzWidth="80%">异常原因描述</th>
+              <th nzWidth="10%">异常类别</th>
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
@@ -151,6 +152,14 @@
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
               <td><textarea rows="1" nz-input [(ngModel)]="data.describes"></textarea></td>
+              <td>
+                <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>
+              </td>
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>
           </tbody>

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

@@ -109,11 +109,12 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
   /**
    * 类型选择事件 （获取类型名称）
    */
-  typeChange(event){
+  typeChange(event,data){
     if(event){
       this.typeListSelect.forEach(element => {
         if(element.id===event){
-          this.fbsAbnormalWorkingHours.typeName=element.typeName;
+          // this.fbsAbnormalWorkingHours.typeName=element.typeName;
+          data.typeName=element.typeName;
         }
       });
     }

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

@@ -113,7 +113,9 @@
         </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>异常类别</td>
         <td>
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.typeId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event)">
@@ -121,7 +123,7 @@
               <nz-option [nzLabel]="type.typeName" [nzValue]="type.id"> </nz-option>
             </ng-container>
           </nz-select>
-        </td>
+        </td> -->
       </tr>
       <tr></tr>
     </tbody>
@@ -143,7 +145,8 @@
           <thead>
             <tr>
               <th nzWidth="10%">序号</th>
-              <th nzWidth="80%">异常原因描述</th>
+              <th nzWidth="70%">异常原因描述</th>
+              <th nzWidth="10%">异常类别</th>
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
@@ -151,6 +154,14 @@
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
               <td><textarea rows="1" nz-input [(ngModel)]="data.describes"></textarea></td>
+              <td>
+                <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>
+              </td>
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>
           </tbody>

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

@@ -178,11 +178,12 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
   /**
    * 类型选择事件 （获取类型名称）
    */
-  typeChange(event){
+  typeChange(event,data){
     if(event){
       this.typeListSelect.forEach(element => {
         if(element.id===event){
-          this.fbsAbnormalWorkingHours.typeName=element.typeName;
+          // this.fbsAbnormalWorkingHours.typeName=element.typeName;
+          data.typeName=element.typeName;
         }
       });
     }

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

@@ -100,10 +100,10 @@
         </td>
         <td>不良品数量</td>
         <td>{{fbsAbnormalWorkingHours.rejectsNumber}}</td>
-        <td>异常类别</td>
+        <!-- <td>异常类别</td>
         <td>
           {{fbsAbnormalWorkingHours.typeName}}
-        </td>
+        </td> -->
       </tr>
       <tr></tr>
     </tbody>
@@ -119,13 +119,15 @@
           <thead>
             <tr>
               <th nzWidth="10%">序号</th>
-              <th nzWidth="90%">异常原因描述</th>
+              <th nzWidth="80%">异常原因描述</th>
+              <th nzWidth="10%">异常类别</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
               <td>{{data.describes}}</td>
+              <td>{{data.typeName}}</td>
             </tr>
           </tbody>
         </nz-table>

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

@@ -118,6 +118,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
       this.productList.forEach(element => {
         if(element.cinvcode===event){
           this.fbsWorkshopDispatchList.product=element.cinvname;
+          this.fbsWorkshopDispatchList.projectName=element.CostItemName;
         }
       });
     }