派工单 报表

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

@@ -90,7 +90,7 @@
         <tr>
           <th colspan="9"></th>
           <ng-container *ngFor="let date of dateList">
-            <th colspan="6" style="background-color:cyan"><strong>{{date.endDate|date:'y-MM-dd'}}</strong></th>
+            <th colspan="6" style="background-color:cyan"><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
           </ng-container>
         </tr>
       </thead>
@@ -164,11 +164,11 @@
           <td colSpan="4">出勤情况</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>应到人数</td>
-            <td>1</td>
+            <td>{{abnormalWorkingHours.numberOfPeopleToArrive}}</td>
             <td>实到人数</td>
-            <td>1</td>
+            <td>{{abnormalWorkingHours.actualNumberOfPeople}}</td>
             <td>出勤工时</td>
-            <td>1</td>
+            <td>{{abnormalWorkingHours.attendanceHours}}</td>
           </ng-container>
         </tr>
         <tr>
@@ -256,7 +256,7 @@
           <td></td>
           <td colSpan="4">异常原因描述</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-            <td colSpan="4">
+            <td colSpan="6">
               <ng-container *ngFor="let describe of abnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList">
                 {{describe.describes}}<br>
               </ng-container>

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

@@ -108,7 +108,7 @@
             <nz-select [(ngModel)]="data.personnelIdU8" style="width: 100%;" nzShowSearch
               nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event,data)">
               <ng-container *ngFor="let proper of properList">
-                <nz-option [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
+                <nz-option [nzLabel]="proper.personnelName" [nzValue]="proper.personnelCode"> </nz-option>
               </ng-container>
             </nz-select>
           </td>

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

@@ -4,6 +4,7 @@ import { _HttpClient } from '@delon/theme';
 import { FbsWorkshopDispatchList } from 'app/entity/fbs/fbs-workshop-dispatch-list';
 import { FbsWorkshopDispatchListService } from 'app/services/fbs/fbs-workshop-dispatch-list.service';
 import { DatePipe } from '@angular/common';
+import { FbsPersonnelService } from 'app/services/fbs/fbs-personnel.service';
 
 @Component({
   selector: 'app-fbs-workshop-dispatch-list-add',
@@ -31,7 +32,8 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
     private drawerRef:NzDrawerRef,
     private fbsWorkshopDispatchListService: FbsWorkshopDispatchListService,
     private nzNotificationService: NzNotificationService,
-    private datePipe:DatePipe
+    private datePipe:DatePipe,
+    private fbsPersonnelService:FbsPersonnelService
   ) { 
     this.getProperList();
     this.getProductionOrderNumberList();
@@ -55,8 +57,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
    * 初始化人员下拉数据集合
    */
   getProperList(){
-    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
-      this.properList=response.result
+    // this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+    //   this.properList=response.result
+    // })
+    this.fbsPersonnelService.list({pageSize:1000}).then((response)=>{
+      this.properList=response.result.records
     })
   }
 
@@ -66,11 +71,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   personnelChange(personnelIdU8,data){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.cpersoncode){
-        data.name=element.cpersonname;
-        data.personnelNameU8=element.cpersonname;
-        data.productionLineId=element.cdepcode;//生产线id
-        data.productionLineName=element.cdepname;//生产线名产
+      if(personnelIdU8===element.personnelCode){
+        data.name=element.personnelName;
+        data.personnelNameU8=element.personnelName;
+        // data.productionLineId=element.cdepcode;//生产线id
+        // data.productionLineName=element.cdepname;//生产线名产
       }
     });
   }

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

@@ -15,7 +15,7 @@
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.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.personnelName" [nzValue]="proper.personnelCode"> </nz-option>
             </ng-container>
           </nz-select>
         </td>

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

@@ -4,6 +4,7 @@ import { _HttpClient } from '@delon/theme';
 import { FbsWorkshopDispatchList } from 'app/entity/fbs/fbs-workshop-dispatch-list';
 import { FbsWorkshopDispatchListService } from 'app/services/fbs/fbs-workshop-dispatch-list.service';
 import { DatePipe } from '@angular/common';
+import { FbsPersonnelService } from 'app/services/fbs/fbs-personnel.service';
 
 @Component({
   selector: 'app-fbs-workshop-dispatch-list-update',
@@ -31,7 +32,8 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
     private drawerRef:NzDrawerRef,
     private fbsWorkshopDispatchListService: FbsWorkshopDispatchListService,
     private nzNotificationService: NzNotificationService,
-    private datePipe:DatePipe
+    private datePipe:DatePipe,
+    private fbsPersonnelService:FbsPersonnelService
   ) { 
     
   }
@@ -51,22 +53,25 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
    * 初始化人员下拉数据集合
    */
   getProperList(){
-    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
-      this.properList=response.result
+    // this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+    //   this.properList=response.result
+    // })
+    this.fbsPersonnelService.list({pageSize:1000}).then((response)=>{
+      this.properList=response.result.records
     })
   }
 
   /**
    * 人员下拉款选择事件
    */
-  personnelChange(personnelIdU8){
+  personnelChange(personnelIdU8,data){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.cpersoncode){
-        this.fbsWorkshopDispatchList.name=element.cpersonname;
-        this.fbsWorkshopDispatchList.personnelNameU8=element.cpersonname;
-        this.fbsWorkshopDispatchList.productionLineId=element.cdepcode;//生产线id
-        this.fbsWorkshopDispatchList.productionLineName=element.cdepname;//生产线名产
+      if(personnelIdU8===element.personnelCode){
+        data.name=element.personnelName;
+        data.personnelNameU8=element.personnelName;
+        // data.productionLineId=element.cdepcode;//生产线id
+        // data.productionLineName=element.cdepname;//生产线名产
       }
     });
   }