被服统计详情跳转

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

@@ -73,19 +73,19 @@
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
             <th nzWidth="5%">序号</th>
-            <th nzWidth="5%">科室名称</th>
-            <th nzShowSort nzWidth="17%" nzSortKey="clothesTypeNum" [(nzSort)]="sortCurrent.clothesTypeNum">回收种类数</th>
-            <th nzShowSort nzWidth="17%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收单数</th>
-            <th nzShowSort nzWidth="17%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回单数</th>
-            <th nzShowSort nzWidth="17%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">洗涤被服数量</th>
-            <th nzShowSort nzWidth="17%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
+            <th nzWidth="15%">科室名称</th>
+            <th nzShowSort nzWidth="15%" nzSortKey="clothesTypeNum" [(nzSort)]="sortCurrent.clothesTypeNum">回收种类数</th>
+            <th nzShowSort nzWidth="15%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收单数</th>
+            <th nzShowSort nzWidth="15%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回单数</th>
+            <th nzShowSort nzWidth="15%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">洗涤被服数量</th>
+            <th nzShowSort nzWidth="15%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
             <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.dept || '' }}</td>
+            <td (click)="toDetail($event, data)" class="clickable">{{ data.dept || '' }}</td>
             <td>{{ data.clothesTypeNum }}</td>
             <td>{{ data.getOrder }}</td>
             <td>{{ data.sendOrder }}</td>

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear } from "date-fns";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, startOfDay, endOfDay } from "date-fns";
 
 import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
@@ -459,8 +459,15 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 跳转详情
+  toDetail(e, data){
+    e.stopPropagation();
+    console.log(data);
+    window.open(`${location.origin}/#/quiltWashingDepartment/${data.id}/${this.dateType}/${this.startDate}/${this.endDate}`);
   }
 
   // 月份选择

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

@@ -58,7 +58,7 @@
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.date }}</td>
+            <td (click)="toDetail($event, data)" class="clickable">{{ data.date }}</td>
             <td>{{ data.deptNum }}</td>
             <td>{{ data.clothesTypeNum }}</td>
             <td>{{ data.getOrder }}</td>

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear } from "date-fns";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, startOfDay, endOfDay } from "date-fns";
 
 import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
@@ -313,8 +313,8 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
   }
 
   // 月份选择
@@ -433,6 +433,13 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
     }, 100);
   }
 
+  // 跳转详情
+  toDetail(e, data){
+    e.stopPropagation();
+    console.log(data);
+    window.open(`${location.origin}/#/quiltWashingHospital/${data.date}/${this.dateType}`);
+  }
+
   // 边输入边搜索节流阀
   isLoading: boolean = false;
   searchTimer(fun, e, those) {

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

@@ -1,6 +1,6 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear } from "date-fns";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, endOfDay, startOfDay } from "date-fns";
 
 import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
@@ -376,8 +376,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
   }
 
   // 月份选择

src/common.less

@@ -215,6 +215,12 @@
   }
 }
 
+// 可点击
+.clickable{
+  text-decoration: underline;
+  cursor: pointer
+}
+
 // list模板样式 start
 .list-template {
   padding: 8px;