工单列表显示优化

src/app/views/order-management/order-management.component.html

@@ -26,9 +26,9 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label label--big">执行支助人员</span>：
+          <span class="label label--big">执行人员</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行支助人员" [(ngModel)]="worker" [nzDisabled]="coopBtns.currentUser && !coopBtns.allOrders">
+            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行人员" [(ngModel)]="worker" [nzDisabled]="coopBtns.currentUser && !coopBtns.allOrders">
             <ng-container *ngFor="let option of allWorker">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
@@ -93,14 +93,11 @@
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
             <th nzWidth="5%">序号</th>
-            <th nzWidth="9%">工单单号</th>
-            <th nzWidth="9%">申请科室</th>
-            <th nzWidth="9%">工单类型</th>
-            <th nzWidth="9%">任务类型</th>
-            <th nzWidth="9%">发起时间</th>
-            <th nzWidth="9%">执行时长</th>
-            <th nzWidth="9%">评价等级</th>
-            <th nzWidth="8%">执行支助人员</th>
+            <th nzWidth="9%">单号|申请科室</th>
+            <th nzWidth="18%">起点科室|终点科室</th>
+            <th nzWidth="9%">工单类型|任务类型</th>
+            <th nzWidth="27%">发起时间|备注</th>
+            <th nzWidth="8%">执行人员|总积分</th>
             <th nzWidth="8%">状态</th>
             <th nzWidth="11%">操作</th>
           </tr>
@@ -110,16 +107,11 @@
             <td nzShowCheckbox [nzDisabled]="data.gdState.value == 6 || data.gdState.value == 7"
               [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.gdcode }}</td>
-            <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
-            <td>{{ data.taskType.associationType.name}}</td>
-            <td>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
-            <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
-            <td>{{ data.showTimeNum }}</td>
-            <td>
-              {{(data.evaluationDetails&&data.evaluationDetails.serviceEvaluation)?data.evaluationDetails.serviceEvaluation.name:''}}
-            </td>
-            <td>{{ data.worker?data.worker.name:'' }}</td>
+            <td>{{ data.gdcode }}<br>{{ data.createDeptDTO ? data.createDeptDTO.dept : '' }}</td>
+            <td>{{ data.startDept ? data.startDept.dept : '' }}<br>{{ data.endDeptsName || '' }}</td>
+            <td>{{ data.taskType.associationType.name}}<br>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
+            <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}<br>{{ data.workOrderRemark }}</td>
+            <td>{{ data.worker?data.worker.name:'' }}<br>{{ data.grade ? data.grade.estimateGradeTotal : '' }}</td>
             <td>{{ data.gdState.name }}</td>
             <td>
               <div class="coop">

src/app/views/order-management/order-management.component.ts

@@ -264,7 +264,7 @@ export class OrderManagementComponent implements OnInit {
       .getFetchDataList("data", "workOrder", data)
       .subscribe((result) => {
         that.loading1 = false;
-        that.listOfData = result.list;
+        that.listOfData = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
         that.listLength = result.totalNum;
       });
   }