预约时间选择BUG修复

src/app/views/hushijiandan/hushijiandan.component.html

@@ -816,14 +816,14 @@
               *ngIf="currentTasktype.associationType.value === 'patientTransport'">
               <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
               <nz-form-control [nzSm]="24" [nzXs]="24">
-                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" [ngModelOptions]="{standalone: true}"
-                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy"></nz-date-picker>
-                <nz-time-picker [nzDisabled]="!isYyInspect" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
+                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}"
+                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
+                <nz-time-picker [nzDisabled]="!isYyInspect||!yyDateZy" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
                   [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)"
                   [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
                   [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                 </nz-time-picker>
-                <button [disabled]="!isYyInspect||(isYyInspect&&!(yyDateZy&&yyTimeZy))" nz-button nzType="primary"
+                <button [disabled]="!isYyInspect||(isYyInspect&&!yyDateZy)" nz-button nzType="primary"
                   class="ml8" (click)="nextDayZy()">下一日</button>
               </nz-form-control>
               <div class="red w100" *ngIf="(!yyTimeZy||!yyDateZy)&&clickYYZyFlag">请填写预约建单时间!</div>
@@ -834,15 +834,15 @@
               *ngIf="currentTasktype.associationType.value === 'inspect'">
               <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
               <nz-form-control [nzSm]="24" [nzXs]="24">
-                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" [ngModelOptions]="{standalone: true}"
-                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate">
+                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}"
+                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
                 </nz-date-picker>
-                <nz-time-picker [nzDisabled]="!isYyInspect" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
+                <nz-time-picker [nzDisabled]="!isYyInspect||!yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
                   [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)"
                   [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
                   [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                 </nz-time-picker>
-                <button [disabled]="!isYyInspect||(isYyInspect&&!(yyDate&&yyTime))" nz-button nzType="primary"
+                <button [disabled]="!isYyInspect||(isYyInspect&&!yyDate)" nz-button nzType="primary"
                   class="ml8" (click)="nextDay()">下一日</button>
               </nz-form-control>
               <div class="red w100" *ngIf="(!yyTime||!yyDate)&&clickYYFlag">请填写预约建单时间!</div>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -30,6 +30,8 @@ import {
   setSeconds,
   addDays,
   differenceInCalendarDays,
+  getHours,
+  getDate,
 } from "date-fns";
 // 日期禁用
 function range(start: number, end: number): number[] {
@@ -270,7 +272,52 @@ export class HushijiandanComponent implements OnInit {
     };
     return this.mainService.getFetchDataList("configuration", "taskType", list);
   }
-
+  //修改预约建单时间的日期
+  yyDateChange(e) {
+    // 获取年月日
+    let yyDate = new Date(e);
+    let year = yyDate.getFullYear();
+    let month = yyDate.getMonth();
+    let date = yyDate.getDate();
+    // 获取当前时间的年月日
+    let now = new Date();
+    let nYear = now.getFullYear();
+    let nMonth = now.getMonth();
+    let nDate = now.getDate();
+    if (year != nYear || month != nMonth || date != nDate) {
+      this.disabledHours = () => [];
+      this.disabledMinutes = (hour) => [];
+    } else {
+      // 禁用小时
+      this.disabledHours = () => {
+        let now = new Date();
+        let nHour = now.getHours();
+        let nMinute = now.getMinutes();
+        if (nMinute > 30) {
+          return range(0, nHour + 1);
+        } else {
+          return range(0, nHour);
+        }
+      };
+      // 禁用分钟
+      this.disabledMinutes = (hour) => {
+        let now = new Date();
+        let nHour = now.getHours();
+        let nMinute = now.getMinutes();
+        if (hour === nHour || hour === undefined) {
+          if (nMinute == 0) {
+            return [];
+          } else if (nMinute <= 30 && nMinute > 0) {
+            return [0];
+          } else {
+            return [0, 30];
+          }
+        } else {
+          return [];
+        }
+      };
+    }
+  }
   // 关闭其他建单保存结果
   closeModel(e) {
     console.log(e);
@@ -701,12 +748,12 @@ export class HushijiandanComponent implements OnInit {
   // 下一日(陪检)
   nextDay() {
     this.yyDate = addDays(this.yyDate, 1);
-    this.yyTime = addDays(this.yyTime, 1);
+    this.yyDateChange(this.yyDate);
   }
   // 下一日(转运)
   nextDayZy() {
     this.yyDateZy = addDays(this.yyDateZy, 1);
-    this.yyTimeZy = addDays(this.yyTimeZy, 1);
+    this.yyDateChange(this.yyDateZy);
   }
   // 禁用日期(陪检)
   disabledyyDate = (current: Date): boolean => {
@@ -878,7 +925,20 @@ export class HushijiandanComponent implements OnInit {
   }
   yyTimeChange(e) {
     if (this.yyTime) {
-      if (getMinutes(this.yyTime) != 30) {
+      let now = new Date();
+      // 禁用日期(陪检)
+      if (getHours(this.yyTime) < getHours(now)) {
+        this.disabledyyDate = (current: Date): boolean => {
+          return differenceInCalendarDays(current, new Date()) < 1;
+        };
+      } else {
+        this.disabledyyDate = (current: Date): boolean => {
+          return differenceInCalendarDays(current, new Date()) < 0;
+        };
+      }
+      if (getMinutes(this.yyTime) > 0 && getMinutes(this.yyTime) < 30) {
+        this.yyTime = setMinutes(this.yyTime, 30);
+      } else if (getMinutes(this.yyTime) > 30 && getMinutes(this.yyTime) < 60){
         this.yyTime = setMinutes(this.yyTime, 0);
       }
     }
@@ -886,7 +946,20 @@ export class HushijiandanComponent implements OnInit {
   }
   yyTimeZyChange(e) {
     if (this.yyTimeZy) {
-      if (getMinutes(this.yyTimeZy) != 30) {
+      let now = new Date();
+      // 禁用日期(转运)
+      if (getHours(this.yyTimeZy) < getHours(now)) {
+        this.disabledyyDateZy = (current: Date): boolean => {
+          return differenceInCalendarDays(current, new Date()) < 1;
+        };
+      } else {
+        this.disabledyyDateZy = (current: Date): boolean => {
+          return differenceInCalendarDays(current, new Date()) < 0;
+        };
+      }
+      if (getMinutes(this.yyTimeZy) > 0 && getMinutes(this.yyTimeZy) < 30) {
+        this.yyTimeZy = setMinutes(this.yyTimeZy, 30);
+      } else if (getMinutes(this.yyTimeZy) > 30 && getMinutes(this.yyTimeZy) < 60) {
         this.yyTimeZy = setMinutes(this.yyTimeZy, 0);
       }
     }
@@ -925,12 +998,28 @@ export class HushijiandanComponent implements OnInit {
       );
     });
     //预约时间-患者陪检不能为空
+    console.log(this.yyTime, this.yyTimeZy, flag, yuyue);
     if (
-      (!this.yyTime && !this.yyDate && !flag && yuyue === "patient-yuyue") ||
-      (!this.yyTimeZy && !this.yyDateZy && flag && yuyue === "patient-zy-yuyue")
+      (!this.yyTime && !flag && yuyue === "patient-yuyue") ||
+      (!this.yyTimeZy && flag && yuyue === "patient-zy-yuyue")
     ) {
       return;
     }
+    if (flag) {
+      //转运
+      this.yyTimeZy =
+        format(new Date(this.yyDateZy), "yyyy-MM-dd") +
+        " " +
+        format(new Date(this.yyTimeZy), "HH:mm") +
+        ":00";
+    } else {
+      //陪检
+      this.yyTime =
+        format(new Date(this.yyDate), "yyyy-MM-dd") +
+        " " +
+        format(new Date(this.yyTime), "HH:mm") +
+        ":00";
+    }
     var that = this;
     for (const i in that.patientForm.controls) {
       that.patientForm.controls[i].markAsDirty();
@@ -1024,6 +1113,11 @@ export class HushijiandanComponent implements OnInit {
     } else {
       if (!yy && that.checkedShowMsg.status == 200) {
         postData.workOrder["checkList"] = checkedArr;
+        // 添加预约时间
+        if (yuyue) {
+          postData.workOrder.yyTime =
+            format(new Date(this.yyTime), "yyyy-MM-dd HH:mm") + ":00";
+        }
       } else {
         delete postData.workOrder["checkList"];
         // 添加预约时间
@@ -1327,6 +1421,7 @@ export class HushijiandanComponent implements OnInit {
         .sort();
       this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约时间,需要减去生效时间
       this.yyDate = new Date(timeList[0] - this.leadTime * 60 * 1000); //回显预约日期,需要减去生效时间
+      this.yyDateChange(this.yyTime);
     } else {
       this.yyTime = null;
       this.yyDate = null;