seimin 1 year ago
parent
commit
1203880cfd

+ 3 - 3
src/app/share/medical-waste-history-prompt-modal/medical-waste-history-prompt-modal.component.html

@@ -16,7 +16,7 @@
16
         </thead>
16
         </thead>
17
         <tbody>
17
         <tbody>
18
           <tr *ngFor="let data of historySpecimenList;let i = index;">
18
           <tr *ngFor="let data of historySpecimenList;let i = index;">
19
-            <td>{{i+1}}</td>
19
+            <td>{{i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1}}</td>
20
             <td>{{ data.clinicalWasteSn }}</td>
20
             <td>{{ data.clinicalWasteSn }}</td>
21
             <td>{{ data.weight }}kg</td>
21
             <td>{{ data.weight }}kg</td>
22
             <td>{{ data.dept ? data.dept.dept : '' }}</td>
22
             <td>{{ data.dept ? data.dept.dept : '' }}</td>
@@ -27,8 +27,8 @@
27
       </nz-table>
27
       </nz-table>
28
       <div class="pagination">
28
       <div class="pagination">
29
         <nz-pagination [(nzPageIndex)]="historySpecimenPageIndex" [(nzTotal)]="historySpecimenListLength"
29
         <nz-pagination [(nzPageIndex)]="historySpecimenPageIndex" [(nzTotal)]="historySpecimenListLength"
30
-          [(nzPageSize)]="historySpecimenPageSize" (nzPageIndexChange)="getHistorySpecimen()"
31
-          (nzPageSizeChange)="getHistorySpecimen()">
30
+          [(nzPageSize)]="historySpecimenPageSize" (nzPageIndexChange)="getList()"
31
+          (nzPageSizeChange)="getList()">
32
         </nz-pagination>
32
         </nz-pagination>
33
       </div>
33
       </div>
34
     </div>
34
     </div>

+ 1 - 1
src/app/share/medical-waste-history-prompt-modal/medical-waste-history-prompt-modal.component.ts

@@ -13,7 +13,7 @@ export class MedicalWasteHistoryPromptModalComponent implements OnInit {
13
   hsLoading = false;
13
   hsLoading = false;
14
   historySpecimenList: any = [];
14
   historySpecimenList: any = [];
15
   historySpecimenPageIndex: number = 1;//表格当前页码
15
   historySpecimenPageIndex: number = 1;//表格当前页码
16
-  historySpecimenPageSize: number = 10;//表格每页展示条数
16
+  historySpecimenPageSize: number = 5;//表格每页展示条数
17
   historySpecimenListLength: number = 10;//表格总数据量
17
   historySpecimenListLength: number = 10;//表格总数据量
18
   @Input() show: Boolean;
18
   @Input() show: Boolean;
19
   @Input() id: String;
19
   @Input() id: String;

+ 1 - 1
src/app/share/medical-waste-log-prompt-modal/medical-waste-log-prompt-modal.component.html

@@ -3,7 +3,7 @@
3
     <div class="title">查看日志<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
3
     <div class="title">查看日志<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
4
     <div class="content">
4
     <div class="content">
5
       <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
5
       <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
6
-        [nzLoading]="hsLoading">
6
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
7
         <thead>
7
         <thead>
8
           <tr class="thead">
8
           <tr class="thead">
9
             <th nzWidth="10%">动作</th>
9
             <th nzWidth="10%">动作</th>

+ 1 - 1
src/app/share/medical-waste-log-prompt-modal/medical-waste-log-prompt-modal.component.ts

@@ -13,7 +13,7 @@ export class MedicalWasteLogPromptModalComponent implements OnInit {
13
   hsLoading = false;
13
   hsLoading = false;
14
   historySpecimenList: any = [];
14
   historySpecimenList: any = [];
15
   historySpecimenPageIndex: number = 1;//表格当前页码
15
   historySpecimenPageIndex: number = 1;//表格当前页码
16
-  historySpecimenPageSize: number = 10;//表格每页展示条数
16
+  historySpecimenPageSize: number = 9999;//表格每页展示条数
17
   historySpecimenListLength: number = 10;//表格总数据量
17
   historySpecimenListLength: number = 10;//表格总数据量
18
   @Input() show: Boolean;
18
   @Input() show: Boolean;
19
   @Input() id: String;
19
   @Input() id: String;