seimin 1 年之前
父节点
当前提交
8cb4bbfafd

+ 2 - 1
src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -93,9 +93,10 @@
93 93
         </tbody>
94 94
       </nz-table>
95 95
       <div class="pagination" *ngIf="type !== 'blood'">
96
+        <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
96 97
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
97 98
           [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
98
-          (nzPageSizeChange)="getList()">
99
+          (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
99 100
         </nz-pagination>
100 101
       </div>
101 102
     </div>

+ 4 - 3
src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -17,7 +17,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
17 17
   pageSize: number = 5;//表格每页展示条数
18 18
   total: number = 0;//表格总数据量
19 19
   searchCriteria:any = {
20
-    stype: null,
20
+    stype: 0,
21 21
   }
22 22
   @Input() show: Boolean;
23 23
   @Input() orderId: String;
@@ -87,10 +87,11 @@ export class BusinessDataDetailModalComponent implements OnInit {
87 87
   }
88 88
 
89 89
   // 获取标本类型
90
-  specimentTypeList: any[] = [];
90
+  specimentTypeList: any[] = [{ id: 0, name: '全部' }];
91 91
   getSpecimenType() {
92 92
     this.mainService.getDictionary("list", "specimen_type").subscribe((data:any) => {
93
-      this.specimentTypeList = data || [];
93
+      let specimentTypeList = [{ id: 0, name: '全部' }];
94
+      this.specimentTypeList = specimentTypeList.concat(data);
94 95
     })
95 96
   }
96 97