优化

src/app/views/quilt-washing-search/quilt-washing-search.component.html

@@ -30,16 +30,18 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="6%">序号</th>
+            <th nzWidth="5%">序号</th>
             <th nzWidth="8%">关联科室</th>
             <th nzWidth="8%">批次号</th>
             <th nzWidth="8%">被服类型</th>
-            <th nzWidth="8%">回收数量</th>
-            <th nzWidth="8%">送回数量</th>
-            <th nzWidth="8%">是否异常</th>
-            <th nzWidth="8%">回收人</th>
+            <th nzWidth="6%">回收数量</th>
+            <th nzWidth="6%">送回数量</th>
+            <th nzWidth="5%">是否异常</th>
+            <th nzWidth="6%">回收人</th>
+            <th nzWidth="6%">回收交接人</th>
             <th nzWidth="11%">回收时间</th>
-            <th nzWidth="8%">送回人</th>
+            <th nzWidth="6%">送回人</th>
+            <th nzWidth="6%">送回交接人</th>
             <th nzWidth="11%">送回时间</th>
             <th nzWidth="8%">状态</th>
           </tr>
@@ -54,8 +56,10 @@
             <td>{{ data.sendBackNum }}</td>
             <td>{{ data.exception == 1 ? '是' : '否' }}</td>
             <td>{{ data.recyclersIdDTO?.name }}</td>
+            <td>{{ data.recyclingHandoverDTO?.name }}</td>
             <td>{{ data.recyclingTime | date:'yyyy-MM-dd HH:mm' }}</td>
             <td>{{ data.sendBackIdDTO?.name }}</td>
+            <td>{{ data.sendHandoverDTO?.name }}</td>
             <td>{{ data.sendBackTime | date:'yyyy-MM-dd HH:mm' }}</td>
             <td>{{ data.clothesState?.name }}</td>
           </tr>

src/app/views/washing-batch-view/washing-batch-view.component.ts

@@ -264,7 +264,7 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
 
   // 表格数据
   getList() {
-    if(!this.searchDto.parent && !this.searchDto.child){
+    if(!this.searchDto.child){
       this.rows = [['id', 'clothesState', ''], [], ['','件数', '费用/元']];
       this.listOfData = [];
       this.totalData = {};