Browse Source

是否动态二维码

seimin 1 year ago
parent
commit
072e7cc94b

+ 3 - 0
src/app/views/office-management/office-management.component.html

@@ -202,7 +202,9 @@
202
               </nz-time-picker>-
202
               </nz-time-picker>-
203
               <nz-time-picker nzFormat="HH:mm" formControlName="endTime1" [nzDisabledHours]="endTime1Hourdis"
203
               <nz-time-picker nzFormat="HH:mm" formControlName="endTime1" [nzDisabledHours]="endTime1Hourdis"
204
                 [nzDisabledMinutes]="endTime1Mindis" (nzOpenChange)="timeChange($event,'endTime',1)"></nz-time-picker>
204
                 [nzDisabledMinutes]="endTime1Mindis" (nzOpenChange)="timeChange($event,'endTime',1)"></nz-time-picker>
205
+                <label class="ml8" [nzDisabled]="!validateForm.value.startTime1 || !validateForm.value.endTime1" nz-checkbox formControlName="dynamicCode1"><span>是否动态二维码签到</span></label>
205
             </nz-form-control>
206
             </nz-form-control>
207
+
206
             <div style="text-align: left;color: red;"
208
             <div style="text-align: left;color: red;"
207
               *ngIf="(validateForm.value.startTime1||validateForm.value.endTime1)&&!(validateForm.value.startTime1&&validateForm.value.endTime1)">
209
               *ngIf="(validateForm.value.startTime1||validateForm.value.endTime1)&&!(validateForm.value.startTime1&&validateForm.value.endTime1)">
208
               请选择完整的服务时间</div>
210
               请选择完整的服务时间</div>
@@ -215,6 +217,7 @@
215
               </nz-time-picker>-
217
               </nz-time-picker>-
216
               <nz-time-picker nzFormat="HH:mm" formControlName="endTime2" [nzDisabledHours]="endTime2Hourdis"
218
               <nz-time-picker nzFormat="HH:mm" formControlName="endTime2" [nzDisabledHours]="endTime2Hourdis"
217
                 [nzDisabledMinutes]="endTime2Mindis" (nzOpenChange)="timeChange($event,'endTime',2)"></nz-time-picker>
219
                 [nzDisabledMinutes]="endTime2Mindis" (nzOpenChange)="timeChange($event,'endTime',2)"></nz-time-picker>
220
+              <label class="ml8" [nzDisabled]="!validateForm.value.startTime2 || !validateForm.value.endTime2" nz-checkbox formControlName="dynamicCode2"><span>是否动态二维码签到</span></label>
218
             </nz-form-control>
221
             </nz-form-control>
219
             <div style="text-align: left;color: red;"
222
             <div style="text-align: left;color: red;"
220
               *ngIf="(validateForm.value.startTime2||validateForm.value.endTime2)&&!(validateForm.value.startTime2&&validateForm.value.endTime2)">
223
               *ngIf="(validateForm.value.startTime2||validateForm.value.endTime2)&&!(validateForm.value.startTime2&&validateForm.value.endTime2)">

+ 1 - 1
src/app/views/office-management/office-management.component.less

@@ -111,7 +111,7 @@
111
   // 新增
111
   // 新增
112
   &.add {
112
   &.add {
113
     .modalBody {
113
     .modalBody {
114
-      width: 480px;
114
+      width: 520px;
115
       height: auto;
115
       height: auto;
116
 
116
 
117
       .content {
117
       .content {

+ 6 - 0
src/app/views/office-management/office-management.component.ts

@@ -324,8 +324,10 @@ export class OfficeManagementComponent implements OnInit {
324
       officeType: [null, [Validators.required]],
324
       officeType: [null, [Validators.required]],
325
       startTime1: [null],
325
       startTime1: [null],
326
       endTime1: [null],
326
       endTime1: [null],
327
+      dynamicCode1: [null],
327
       startTime2: [null],
328
       startTime2: [null],
328
       endTime2: [null],
329
       endTime2: [null],
330
+      dynamicCode2: [null],
329
     });
331
     });
330
   }
332
   }
331
   // 科室位置必填
333
   // 科室位置必填
@@ -439,6 +441,7 @@ export class OfficeManagementComponent implements OnInit {
439
           this.validateForm.value.endTime1,
441
           this.validateForm.value.endTime1,
440
           "yyyy-MM-dd HH:mm:ss"
442
           "yyyy-MM-dd HH:mm:ss"
441
         );
443
         );
444
+        data.department["dynamicCode1"] = this.validateForm.value.dynamicCode1 ? 1 : 0;
442
       } else {
445
       } else {
443
         return;
446
         return;
444
       }
447
       }
@@ -459,6 +462,7 @@ export class OfficeManagementComponent implements OnInit {
459
           this.validateForm.value.endTime2,
462
           this.validateForm.value.endTime2,
460
           "yyyy-MM-dd HH:mm:ss"
463
           "yyyy-MM-dd HH:mm:ss"
461
         );
464
         );
465
+        data.department["dynamicCode2"] = this.validateForm.value.dynamicCode2 ? 1 : 0;
462
       } else {
466
       } else {
463
         return;
467
         return;
464
       }
468
       }
@@ -509,10 +513,12 @@ export class OfficeManagementComponent implements OnInit {
509
     if (data.startTime1 && data.endTime1) {
513
     if (data.startTime1 && data.endTime1) {
510
       this.validateForm.controls.startTime1.setValue(new Date(data.startTime1));
514
       this.validateForm.controls.startTime1.setValue(new Date(data.startTime1));
511
       this.validateForm.controls.endTime1.setValue(new Date(data.endTime1));
515
       this.validateForm.controls.endTime1.setValue(new Date(data.endTime1));
516
+      this.validateForm.controls.dynamicCode1.setValue(data.dynamicCode1 == 1);
512
     }
517
     }
513
     if (data.startTime2 && data.endTime2) {
518
     if (data.startTime2 && data.endTime2) {
514
       this.validateForm.controls.startTime2.setValue(new Date(data.startTime2));
519
       this.validateForm.controls.startTime2.setValue(new Date(data.startTime2));
515
       this.validateForm.controls.endTime2.setValue(new Date(data.endTime2));
520
       this.validateForm.controls.endTime2.setValue(new Date(data.endTime2));
521
+      this.validateForm.controls.dynamicCode2.setValue(data.dynamicCode2 == 1);
516
     }
522
     }
517
     this.validateForm.controls.officeAddress.setValue(data.address);
523
     this.validateForm.controls.officeAddress.setValue(data.address);
518
     if (data.parent) {
524
     if (data.parent) {

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8
   enableProdMode();
8
   enableProdMode();
9
   if (window) {
9
   if (window) {
10
     window.console.log = function () { };
10
     window.console.log = function () { };
11
-    console.info('v2.4.40');
11
+    console.info('v2.4.41');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)