Merge branch 'master' into develop

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

@@ -4,7 +4,8 @@
       <div nz-col nzXl='18' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">发起时间</span>：
-          <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]='false' (ngModelChange)="changeDate($event)">
+          <nz-range-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateRange" [nzAllowClear]='false'
+            (ngModelChange)="changeDate($event)">
           </nz-range-picker>
           <br />
         </div>

src/app/views/inspect-active/inspect-active.component.ts

@@ -7,6 +7,7 @@ import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { differenceInCalendarDays } from "date-fns";
 
 @Component({
   selector: "app-inspect-active",
@@ -59,6 +60,10 @@ export class InspectActiveComponent implements OnInit {
   ifSuccess: boolean; //操作成功/失败
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
+  // 只能选择今天之前的日期
+  disabledDate = (current: Date): boolean => {
+    return differenceInCalendarDays(current, new Date()) > -1;
+  };
 
   // 初始化增删改按钮
   coopBtns: any = {};