工单列表和支助人员统计日期选择修改

src/app/services/date.service.ts

@@ -9,6 +9,7 @@ import {
   startOfYear,
   addYears,
   endOfYear,
+  endOfWeek,
 } from "date-fns";
 
 @Injectable({
@@ -24,25 +25,25 @@ export class DateService {
     function getLastWeekStartDate() {
       return addDays(startOfWeek(new Date()), -6);
     }
-    //获得上周的结束日期(上周日 00:00:00)
+    //获得上周的结束日期(上周日 23:59:59)
     function getLastWeekEndDate() {
-      return startOfWeek(new Date());
+      return addDays(endOfWeek(new Date()), -6);
     }
     //获得上月开始时间(上月1号 00：00：00)
     function getLastMonthStartDate() {
       return startOfMonth(addMonths(new Date(), -1));
     }
-    //获得上月结束时间(上月底 00：00：00)
+    //获得上月结束时间(上月底 23:59:59)
     function getLastMonthEndDate() {
-      return startOfDay(endOfMonth(addMonths(new Date(), -1)));
+      return endOfMonth(addMonths(new Date(), -1));
     }
     //获得上年的开始日期(去年1月1日 00：00：00)
     function getLastYearStartDate() {
       return startOfYear(addYears(new Date(), -1));
     }
-    //获得上年的结束日期(去年12月31日 00：00：00)
+    //获得上年的结束日期(去年12月31日 23:59:59)
     function getLastYearEndDate() {
-      return startOfDay(endOfYear(addYears(new Date(), -1)));
+      return endOfYear(addYears(new Date(), -1));
     }
     return {
       lastWeekStartDate: getLastWeekStartDate(),

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

@@ -72,7 +72,7 @@
           <span class="label">发起时间</span>：
           <!-- <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"
             [nzDisabled]="checkOptionsOne[2]?.checked"></nz-range-picker> -->
-          <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
       </div>
       <div nz-col nzXl='7' class="list-template__btns">

src/app/views/order-management/order-management.component.ts

@@ -6,6 +6,7 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { format } from 'date-fns';
 @Component({
   selector: "app-order-management",
   templateUrl: "./order-management.component.html",
@@ -330,22 +331,8 @@ export class OrderManagementComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate =
-      result[0].getFullYear() +
-      "-" +
-      (result[0].getMonth() + 1) +
-      "-" +
-      result[0].getDate() +
-      " " +
-      "00:00:00";
-    this.endDate =
-      result[1].getFullYear() +
-      "-" +
-      (result[1].getMonth() + 1) +
-      "-" +
-      result[1].getDate() +
-      " " +
-      "23:59:59";
+    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）

src/app/views/worker-statistics/worker-statistics.component.html

@@ -5,7 +5,7 @@
         <div class="list-template__searchItem">
           <span class="label">发起时间</span>：
           <nz-range-picker
-            [(ngModel)]="dateRange"
+            [(ngModel)]="dateRange" nzShowTime
             [nzAllowClear]="false"
             (ngModelChange)="changeDate($event)"
           >

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -5,6 +5,7 @@ import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
 import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
+import { format } from 'date-fns';
 
 @Component({
   selector: "app-worker-statistics",
@@ -90,8 +91,8 @@ export class WorkerStatisticsComponent implements OnInit {
     }
     if (this.startDate) {
       this.searchData["dateRange"] = {
-        start: this.startDate + " " + "00:00:00",
-        end: this.endDate + " " + "23:59:59",
+        start: this.startDate,
+        end: this.endDate,
       };
     }
     if (num !== undefined) {
@@ -119,8 +120,8 @@ export class WorkerStatisticsComponent implements OnInit {
   export(obj) {
     let postData: any = {
       hosId: this.hospital,
-      startTime: this.startDate + " " + "00:00:00",
-      endTime: this.endDate + " " + "23:59:59",
+      startTime: this.startDate,
+      endTime: this.endDate,
       groupId: this.group || "",
       specialClose: this.checkOptionsOne[0].checked ? 0 : undefined,
     };
@@ -251,18 +252,8 @@ export class WorkerStatisticsComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate =
-      result[0].getFullYear() +
-      "-" +
-      (result[0].getMonth() + 1) +
-      "-" +
-      result[0].getDate();
-    this.endDate =
-      result[1].getFullYear() +
-      "-" +
-      (result[1].getMonth() + 1) +
-      "-" +
-      result[1].getDate();
+    this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
     this.search();
   }
   // 修改搜素条件工作组
@@ -337,8 +328,8 @@ export class WorkerStatisticsComponent implements OnInit {
   }
   //获取配送人员工单详情列表
   personDetail(workerId) {
-    let startDate = this.startDate + " " + "00:00:00";
-    let endDate = this.endDate + " " + "23:59:59";
+    let startDate = this.startDate;
+    let endDate = this.endDate;
     let group = this.group || "null";
     this.router.navigateByUrl(
       `/main/workerStatistics/workerStatisticsDetail/${workerId}/${startDate}/${endDate}/${group}/workerStatistics/null/${this.checkOptionsOne[0].checked ? 0 : 'null'}`