选择预约建单时间控件BUG修复

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

@@ -786,8 +786,8 @@
               <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTimeZy"
                 (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}"
                 [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
-              <label nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)" class="ml8"
-                [ngModelOptions]="{standalone: true}">次日</label>
+              <label *ngIf="yyTimeZy" nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)"
+                class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
             </nz-form-control>
             <div class="red w100" *ngIf="!yyTimeZy&&clickYYZyFlag">请填写预约建单时间!</div>
             <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
@@ -800,8 +800,8 @@
               <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTime"
                 (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{standalone: true}"
                 [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
-              <label nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)" class="ml8"
-                [ngModelOptions]="{standalone: true}">次日</label>
+              <label *ngIf="yyTime" nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)"
+                class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
             </nz-form-control>
             <div class="red w100" *ngIf="!yyTime&&clickYYFlag">请填写预约建单时间!</div>
             <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>

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

@@ -547,7 +547,10 @@ export class HushijiandanComponent implements OnInit {
             // 标本权限
             that.getSpecimenWorkOrderMsg();
           }
-          if (that.deptTaskTypeRules.openStaticDistribution||that.deptTaskTypeRules.openDrugsBag) {
+          if (
+            that.deptTaskTypeRules.openStaticDistribution ||
+            that.deptTaskTypeRules.openDrugsBag
+          ) {
             // 药品静配权限
             that.getJpDrugsWKOMsg();
           }
@@ -850,6 +853,8 @@ export class HushijiandanComponent implements OnInit {
       if (getMinutes(this.yyTime) != 30) {
         this.yyTime = setMinutes(this.yyTime, 0);
       }
+    }else{
+      this.nextDay = false;
     }
     this.clickYYFlag = false;
   }
@@ -858,6 +863,8 @@ export class HushijiandanComponent implements OnInit {
       if (getMinutes(this.yyTimeZy) != 30) {
         this.yyTimeZy = setMinutes(this.yyTimeZy, 0);
       }
+    }else{
+      this.nextDayZy = false;
     }
     this.clickYYZyFlag = false;
   }
@@ -869,19 +876,79 @@ export class HushijiandanComponent implements OnInit {
   // 次日-陪检
   nextDay = false;
   nextDayChange(e) {
-    if (e) {
-      this.yyTime = addDays(this.yyTime, 1);
-    } else {
-      this.yyTime = addDays(this.yyTime, -1);
+    if (this.yyTime) {
+      if (e) {
+        this.yyTime = addDays(this.yyTime, 1);
+        this.disabledHours = () => [];
+        this.disabledMinutes = (hour) => [];
+      } else {
+        this.yyTime = addDays(this.yyTime, -1);
+        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 [];
+          }
+        };
+      }
     }
   }
   // 次日-陪检
   nextDayZy = false;
   nextDayZyChange(e) {
-    if (e) {
-      this.yyTimeZy = addDays(this.yyTimeZy, 1);
-    } else {
-      this.yyTimeZy = addDays(this.yyTimeZy, -1);
+    if (this.yyTimeZy) {
+      if (e) {
+        this.yyTimeZy = addDays(this.yyTimeZy, 1);
+        this.disabledHours = () => [];
+        this.disabledMinutes = (hour) => [];
+      } else {
+        this.yyTimeZy = addDays(this.yyTimeZy, -1);
+        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 [];
+          }
+        };
+      }
     }
   }
   // 预约建单
@@ -1318,7 +1385,6 @@ export class HushijiandanComponent implements OnInit {
     let now = new Date();
     let nHour = now.getHours();
     let nMinute = now.getMinutes();
-    console.log(hour, nHour);
     if (hour === nHour || hour === undefined) {
       if (nMinute == 0) {
         return [];