Browse Source

分页BUG

seimin 2 years ago
parent
commit
92b46a8bc3

+ 1 - 1
src/app/share/batch-orders/batch-orders.component.html

@@ -23,7 +23,7 @@
23
       <tbody>
23
       <tbody>
24
         <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data.id)">
24
         <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data.id)">
25
           <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
25
           <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
26
-          <td>{{index+(pageIndex-1)*10+1}}</td>
26
+          <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
27
           <td>{{data.createDept.dept}}</td>
27
           <td>{{data.createDept.dept}}</td>
28
           <td>{{data.startDept.dept}}</td>
28
           <td>{{data.startDept.dept}}</td>
29
           <td>{{data.endDept.dept}}</td>
29
           <td>{{data.endDept.dept}}</td>

+ 1 - 1
src/app/views/advice-management/advice-management.component.html

@@ -42,7 +42,7 @@
42
         </thead>
42
         </thead>
43
         <tbody>
43
         <tbody>
44
           <tr *ngFor="let data of listOfData;let index=index;">
44
           <tr *ngFor="let data of listOfData;let index=index;">
45
-            <td>{{index+(pageIndex-1)*10+1}}</td>
45
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
46
             <td>{{ data.creatDepartment.dept }}</td>
46
             <td>{{ data.creatDepartment.dept }}</td>
47
             <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
47
             <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
48
             <td>
48
             <td>

+ 1 - 1
src/app/views/appraise-management/appraise-management.component.html

@@ -68,7 +68,7 @@
68
         </thead>
68
         </thead>
69
         <tbody>
69
         <tbody>
70
           <tr *ngFor="let data of listOfData;let index=index;">
70
           <tr *ngFor="let data of listOfData;let index=index;">
71
-            <td>{{index+(pageIndex-1)*10+1}}</td>
71
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
72
             <td>{{data.workOrderObj?data.workOrderObj.gdcode:''}}</td>
72
             <td>{{data.workOrderObj?data.workOrderObj.gdcode:''}}</td>
73
             <td>{{ data.startDept.dept }}</td>
73
             <td>{{ data.startDept.dept }}</td>
74
             <td>{{data.workOrderObj.taskType.taskName}}</td>
74
             <td>{{data.workOrderObj.taskType.taskName}}</td>

+ 1 - 1
src/app/views/dept-order-source-statistics/dept-order-source-statistics.component.html

@@ -55,7 +55,7 @@
55
         </thead>
55
         </thead>
56
         <tbody>
56
         <tbody>
57
           <tr *ngFor="let data of listOfData;let index=index;">
57
           <tr *ngFor="let data of listOfData;let index=index;">
58
-            <td>{{index+(pageIndex-1)*10+1}}</td>
58
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
59
             <td>{{ data.deptName }}</td>
59
             <td>{{ data.deptName }}</td>
60
             <td>{{ data.source1||0}}</td>
60
             <td>{{ data.source1||0}}</td>
61
             <td>{{data.source2||0}}</td>
61
             <td>{{data.source2||0}}</td>

+ 1 - 1
src/app/views/dept-statistics/dept-statistics.component.html

@@ -41,7 +41,7 @@
41
         </thead>
41
         </thead>
42
         <tbody>
42
         <tbody>
43
           <tr *ngFor="let data of listOfData;let index=index;">
43
           <tr *ngFor="let data of listOfData;let index=index;">
44
-            <td>{{index+(pageIndex-1)*10+1}}</td>
44
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
45
             <td>{{ data.date }}</td>
45
             <td>{{ data.date }}</td>
46
             <td>{{ data.total||0}}</td>
46
             <td>{{ data.total||0}}</td>
47
             <td>{{data.elevateCount||0}}</td>
47
             <td>{{data.elevateCount||0}}</td>

+ 1 - 1
src/app/views/inspect-active-detail/inspect-active-detail.component.html

@@ -21,7 +21,7 @@
21
       </thead>
21
       </thead>
22
       <tbody>
22
       <tbody>
23
         <tr *ngFor="let data of listOfData;let index=index;">
23
         <tr *ngFor="let data of listOfData;let index=index;">
24
-          <td>{{index+(pageIndex-1)*10+1}}</td>
24
+          <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
25
           <td>{{data.datetime|date:'yyyy-MM-dd hh:mm'}}</td>
25
           <td>{{data.datetime|date:'yyyy-MM-dd hh:mm'}}</td>
26
           <td>{{data.userName}}</td>
26
           <td>{{data.userName}}</td>
27
           <td>{{data.count5}}</td>
27
           <td>{{data.count5}}</td>

+ 1 - 1
src/app/views/inspect-active-order-list/inspect-active-order-list.component.html

@@ -20,7 +20,7 @@
20
       </thead>
20
       </thead>
21
       <tbody>
21
       <tbody>
22
         <tr *ngFor="let data of listOfData;let index=index;">
22
         <tr *ngFor="let data of listOfData;let index=index;">
23
-          <td>{{index+(pageIndex-1)*10+1}}</td>
23
+          <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
24
           <td>{{data.gdcode}}</td>
24
           <td>{{data.gdcode}}</td>
25
           <td>{{data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
25
           <td>{{data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
26
           <td>{{data.showTimeNum}}</td>
26
           <td>{{data.showTimeNum}}</td>

+ 1 - 1
src/app/views/inspect-active/inspect-active.component.html

@@ -53,7 +53,7 @@
53
         </thead>
53
         </thead>
54
         <tbody>
54
         <tbody>
55
           <tr *ngFor="let data of listOfData;let index=index;">
55
           <tr *ngFor="let data of listOfData;let index=index;">
56
-            <td>{{index+(pageIndex-1)*10+1}}</td>
56
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
57
             <td>{{data.deptName}}</td>
57
             <td>{{data.deptName}}</td>
58
             <td>{{data.count5}}</td>
58
             <td>{{data.count5}}</td>
59
             <td>{{data.count1}}</td>
59
             <td>{{data.count1}}</td>

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

@@ -109,7 +109,7 @@
109
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
109
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
110
             <td nzShowCheckbox [nzDisabled]="data.gdState.value == 6 || data.gdState.value == 7"
110
             <td nzShowCheckbox [nzDisabled]="data.gdState.value == 6 || data.gdState.value == 7"
111
               [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
111
               [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
112
-            <td>{{index+(pageIndex-1)*10+1}}</td>
112
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
113
             <td>{{ data.gdcode }}</td>
113
             <td>{{ data.gdcode }}</td>
114
             <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
114
             <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
115
             <td>{{ data.taskType.associationType.name}}</td>
115
             <td>{{ data.taskType.associationType.name}}</td>

+ 1 - 1
src/app/views/order-source-statistics/order-source-statistics.component.html

@@ -55,7 +55,7 @@
55
         </thead>
55
         </thead>
56
         <tbody>
56
         <tbody>
57
           <tr *ngFor="let data of listOfData;let index=index;">
57
           <tr *ngFor="let data of listOfData;let index=index;">
58
-            <td>{{index+(pageIndex-1)*10+1}}</td>
58
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
59
             <td>{{ data.date }}</td>
59
             <td>{{ data.date }}</td>
60
             <td>{{ data.source1||0}}</td>
60
             <td>{{ data.source1||0}}</td>
61
             <td>{{data.source2||0}}</td>
61
             <td>{{data.source2||0}}</td>

+ 1 - 1
src/app/views/order-statistics/order-statistics.component.html

@@ -59,7 +59,7 @@
59
         </thead>
59
         </thead>
60
         <tbody>
60
         <tbody>
61
           <tr *ngFor="let data of listOfData;let index=index;">
61
           <tr *ngFor="let data of listOfData;let index=index;">
62
-            <td>{{index+(pageIndex-1)*10+1}}</td>
62
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
63
             <td>{{ data.date }}</td>
63
             <td>{{ data.date }}</td>
64
             <td>{{ data.total||0}}</td>
64
             <td>{{ data.total||0}}</td>
65
             <td>{{data.speCount||0}}</td>
65
             <td>{{data.speCount||0}}</td>

+ 1 - 1
src/app/views/task-type-statistics/task-type-statistics.component.html

@@ -38,7 +38,7 @@
38
         </thead>
38
         </thead>
39
         <tbody>
39
         <tbody>
40
           <tr *ngFor="let data of listOfData;let index=index;">
40
           <tr *ngFor="let data of listOfData;let index=index;">
41
-            <td>{{index+(pageIndex-1)*10+1}}</td>
41
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
42
             <td>{{ data.name }}</td>
42
             <td>{{ data.name }}</td>
43
             <td>{{ data.total||0}}</td>
43
             <td>{{ data.total||0}}</td>
44
             <td>{{data.responseTime}}</td>
44
             <td>{{data.responseTime}}</td>

+ 1 - 1
src/app/views/tasktype-order-source-statistics/tasktype-order-source-statistics.component.html

@@ -55,7 +55,7 @@
55
         </thead>
55
         </thead>
56
         <tbody>
56
         <tbody>
57
           <tr *ngFor="let data of listOfData;let index=index;">
57
           <tr *ngFor="let data of listOfData;let index=index;">
58
-            <td>{{index+(pageIndex-1)*10+1}}</td>
58
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
59
             <td>{{ data.taskName }}</td>
59
             <td>{{ data.taskName }}</td>
60
             <td>{{ data.source1||0}}</td>
60
             <td>{{ data.source1||0}}</td>
61
             <td>{{data.source2||0}}</td>
61
             <td>{{data.source2||0}}</td>

+ 1 - 1
src/app/views/users-management/users-management.component.html

@@ -63,7 +63,7 @@
63
         </thead>
63
         </thead>
64
         <tbody>
64
         <tbody>
65
           <tr *ngFor="let data of listOfData;let index=index;">
65
           <tr *ngFor="let data of listOfData;let index=index;">
66
-            <td>{{index+(pageIndex-1)*10+1}}</td>
66
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
67
             <td>{{ data.name||'-' }}</td>
67
             <td>{{ data.name||'-' }}</td>
68
             <td>{{ data.account||'-' }}</td>
68
             <td>{{ data.account||'-' }}</td>
69
             <td>{{data.gender?data.gender.name:'-'}}</td>
69
             <td>{{data.gender?data.gender.name:'-'}}</td>

+ 1 - 1
src/app/views/worker-statistics-detail/worker-statistics-detail.component.html

@@ -25,7 +25,7 @@
25
       </thead>
25
       </thead>
26
       <tbody>
26
       <tbody>
27
         <tr *ngFor="let data of listOfData;let index=index;">
27
         <tr *ngFor="let data of listOfData;let index=index;">
28
-          <td>{{index+(pageIndex-1)*10+1}}</td>
28
+          <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
29
           <td>{{ data.gdcode }}</td>
29
           <td>{{ data.gdcode }}</td>
30
           <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
30
           <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
31
           <td>{{ data.taskType.associationType.name }}</td>
31
           <td>{{ data.taskType.associationType.name }}</td>

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8
   enableProdMode();
8
   enableProdMode();
9
   if (window) {
9
   if (window) {
10
     window.console.log = function () { };
10
     window.console.log = function () { };
11
-    console.info('v2.4.21');
11
+    console.info('v2.4.22');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)