调整

src/app/routes/dashboard/analysis/analysis.component.html

@@ -76,7 +76,7 @@
           <th nzWidth="120px" nzAlign="center"><strong>物料编码</strong></th>
           <th nzWidth="100px" nzAlign="center"><strong>物料名称</strong></th>
           <th nzWidth="80px" nzAlign="center"><strong>月度计划</strong></th>
-          <th nzWidth="80px" nzAlign="center"><strong>标准工时</strong></th>
+          <th nzWidth="100px" nzAlign="center"><strong>标准总工时</strong></th>
           <th nzWidth="110px" nzAlign="center"><strong>累计完成数量</strong></th>
           <th nzWidth="110px" nzAlign="center"><strong>累计完成工时</strong></th>
           <ng-container *ngFor="let date of dateList">

src/app/routes/dashboard/analysis/analysis.component.ts

@@ -308,7 +308,7 @@ export class DashboardAnalysisComponent implements OnInit {
   getDateList(){
     if(this.listOfData&&this.listOfData.length>0){
       this.dateList=this.listOfData[0].fbsWorkshopDispatchListList
-      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*700)+870;
+      this.widthLength=(this.listOfData[0].fbsWorkshopDispatchListList.length*700)+890;
     }
   }
 

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

@@ -142,7 +142,10 @@
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.warehouseOthers" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
         </td>
-        <td colSpan="5"></td>
+        <td >备注</td>
+        <td colSpan="3"> 
+          <textarea rows="2" nz-input [(ngModel)]="fbsAbnormalWorkingHours.memo"></textarea>
+        </td>
       </tr>
       <tr>
         <!-- <td>改善措施</td>

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

@@ -142,7 +142,10 @@
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.warehouseOthers" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
         </td>
-        <td colSpan="5"></td>
+        <td >备注</td>
+        <td colSpan="3"> 
+          <textarea rows="2" nz-input [(ngModel)]="fbsAbnormalWorkingHours.memo"></textarea>
+        </td>
       </tr>
       <tr>
         <!-- <td>改善措施</td>

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

@@ -128,7 +128,10 @@
         <td>
           {{fbsAbnormalWorkingHours.warehouseOthers}}
         </td>
-        <td colSpan="5"></td>
+        <td >备注</td>
+        <td colSpan="3"> 
+          {{fbsAbnormalWorkingHours.memo}}
+        </td>
       </tr>
       <!-- <tr>
         <td>改善措施</td>

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

@@ -124,6 +124,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
     this.fbsWorkshopDispatchListService.getInventoryGetByOrderId(moId).then((response)=>{
       // this.productList=response.result;
       data.productList=response.result;
+      if(data.productList){//自动带出产品选择
+        data.productId=data.productList[0].cinvcode;
+        this.productChange(data.productList[0].cinvcode,data);
+      }
+      
     })
   }
 
@@ -135,7 +140,6 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
       data.productList.forEach(element => {
         if(element.cinvcode===event){
           data.product=element.cinvname;
-          
           data.rowNumber=element.sortSeq;
           data.plannedQuantity=element.qty;
           data.standardWorkingHoursZ=element.cinvdefine13;

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

@@ -112,6 +112,10 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   getProductList(moId){
     this.fbsWorkshopDispatchListService.getInventoryGetByOrderId(moId).then((response)=>{
       this.productList=response.result;
+      if(this.productList){//自动带出产品选择
+        this.fbsWorkshopDispatchList.productId=this.productList[0].cinvcode;
+        this.productChange(this.fbsWorkshopDispatchList.productId);
+      }
     })
   }