seimin 10 kuukautta sitten
vanhempi
commit
c6de1e4fd4

+ 1 - 1
src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.html

@@ -10,7 +10,7 @@
10 10
         <div class="list-template__searchItem">
11 11
           <span class="label">发起时间</span>:
12 12
           <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
13
-            [nzDisabledDate]="disabledDate" nzShowTime  (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)">
13
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
14 14
           </nz-range-picker>
15 15
           <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
16 16
             (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">

+ 1 - 1
src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.html

@@ -10,7 +10,7 @@
10 10
         <div class="list-template__searchItem">
11 11
           <span class="label">发起时间</span>:
12 12
           <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
13
-            [nzDisabledDate]="disabledDate" nzShowTime  (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)">
13
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
14 14
           </nz-range-picker>
15 15
           <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
16 16
             (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">

+ 7 - 13
src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.html

@@ -10,7 +10,7 @@
10 10
         <div class="list-template__searchItem">
11 11
           <span class="label">发起时间</span>:
12 12
           <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
13
-            [nzDisabledDate]="disabledDate" nzShowTime  (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)">
13
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
14 14
           </nz-range-picker>
15 15
           <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
16 16
             (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">
@@ -65,15 +65,12 @@
65 65
           <tr class="thead">
66 66
             <th nzWidth="5%">序号</th>
67 67
             <th nzWidth="5%">人员姓名</th>
68
-            <th nzShowSort nzWidth="10%" nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
69
-            <th nzShowSort nzWidth="10%" nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
70
-            <th nzShowSort nzWidth="10%" nzSortKey="getTrip" [(nzSort)]="sortCurrent.getTrip">回收趟数</th>
71
-            <th nzShowSort nzWidth="10%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
72
-            <th nzShowSort nzWidth="10%" nzSortKey="getClothesNum" [(nzSort)]="sortCurrent.getClothesNum">回收被服数量</th>
73
-            <th nzShowSort nzWidth="10%" nzSortKey="sendTrip" [(nzSort)]="sortCurrent.sendTrip">送回趟数</th>
74
-            <th nzShowSort nzWidth="10%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th>
75
-            <th nzShowSort nzWidth="10%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">送回被服数量</th>
76
-            <th nzShowSort nzWidth="10%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
68
+            <th nzShowSort nzWidth="15%" nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
69
+            <th nzShowSort nzWidth="15%" nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
70
+            <th nzShowSort nzWidth="15%" nzSortKey="getTrip" [(nzSort)]="sortCurrent.getTrip">回收趟数</th>
71
+            <th nzShowSort nzWidth="15%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
72
+            <th nzShowSort nzWidth="15%" nzSortKey="sendTrip" [(nzSort)]="sortCurrent.sendTrip">送回趟数</th>
73
+            <th nzShowSort nzWidth="15%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th>
77 74
           </tr>
78 75
         </thead>
79 76
         <tbody>
@@ -84,11 +81,8 @@
84 81
             <td>{{ data.totalOrder }}</td>
85 82
             <td>{{ data.getTrip }}</td>
86 83
             <td>{{ data.getOrder }}</td>
87
-            <td>{{ data.getClothesNum }}</td>
88 84
             <td>{{ data.sendTrip }}</td>
89 85
             <td>{{ data.sendOrder }}</td>
90
-            <td>{{ data.sendClothesNum }}</td>
91
-            <td>{{ data.price }}</td>
92 86
           </tr>
93 87
         </tbody>
94 88
       </nz-table>

+ 0 - 6
src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.ts

@@ -218,11 +218,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
218 218
       totalOrder: null,
219 219
       getTrip: null,
220 220
       getOrder: null,
221
-      getClothesNum: null,
222 221
       sendTrip: null,
223 222
       sendOrder: null,
224
-      sendClothesNum: null,
225
-      price: null,
226 223
     };
227 224
     this.searchDto = {
228 225
       group: null,
@@ -511,11 +508,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
511 508
     totalOrder: null,
512 509
     getTrip: null,
513 510
     getOrder: null,
514
-    getClothesNum: null,
515 511
     sendTrip: null,
516 512
     sendOrder: null,
517
-    sendClothesNum: null,
518
-    price: null,
519 513
   };
520 514
   sortCurrentKey: string = "";
521 515
   sortCurrentValue: string | null = "";