seimin лет назад: 3
Родитель
Сommit
2a8977d8d6

+ 4 - 1
src/app/views/holidays-management/holidays-management.component.html

@@ -2,7 +2,8 @@
2 2
   <div class="set display_flex justify-content_space-between align-items_center">
3 3
     <span>工作日:周一、周二、周三、周四、周五;节假日:周六、周日;</span>
4 4
     <div>
5
-      <label nz-checkbox [(ngModel)]="syncWorkDay" (ngModelChange)="setSyncWorkDay($event)" [nzDisabled]="!coopBtns.edit">自动同步国家法定节假日</label>
5
+      <label nz-checkbox [(ngModel)]="syncWorkDay" (ngModelChange)="setSyncWorkDay($event)"
6
+        [nzDisabled]="!coopBtns.edit">自动同步国家法定节假日</label>
6 7
       <button class="btn default" [disabled]="!coopBtns.edit" (click)='showModal()'>设置</button>
7 8
     </div>
8 9
   </div>
@@ -73,3 +74,5 @@
73 74
 <!-- 操作成功/失败提示框 -->
74 75
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
75 76
   [info]="promptInfo"></app-prompt-modal>
77
+<!-- 遮罩 -->
78
+<app-mask *ngIf="maskFlag"></app-mask>

+ 21 - 15
src/app/views/holidays-management/holidays-management.component.ts

@@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
4 4
 
5 5
 import { NzMessageService } from "ng-zorro-antd/message";
6 6
 import { ToolService } from "src/app/services/tool.service";
7
+import { format } from "date-fns";
7 8
 
8 9
 @Component({
9 10
   selector: "app-holidays-management",
@@ -46,19 +47,23 @@ export class HolidaysManagementComponent implements OnInit {
46 47
 
47 48
   // 初始化增删改按钮
48 49
   coopBtns: any = {};
50
+  maskFlag: any = false;
49 51
   //设置自动同步国家法定节假日
50 52
   setSyncWorkDay(e) {
51
-    this.syncWorkDayObj.syncWorkDay = e;
52
-    let postData = { syncWorkDay: this.syncWorkDayObj };
53
+    this.syncWorkDayObj.valueconfig = Number(e);
54
+    let postData = { syncWorkDay: JSON.stringify(this.syncWorkDayObj) };
55
+    this.maskFlag = this.msg.loading("加载中", { nzDuration: 0 }).messageId;
53 56
     this.mainService.syncWorkDay(postData).subscribe((result) => {
54
-      if (result["status"] == 200) {
55
-        this.msg.success("设置成功", {
56
-          nzDuration: 1000,
57
-        });
57
+      this.msg.remove(this.maskFlag);
58
+      this.maskFlag = false;
59
+      if (result["state"] == 200) {
60
+        this.msg.success("设置成功");
61
+        this.initDates(
62
+          this.lastSelectMonth.getFullYear(),
63
+          this.lastSelectMonth.getMonth()
64
+        );
58 65
       } else {
59
-        this.msg.error("设置失败", {
60
-          nzDuration: 1000,
61
-        });
66
+        this.msg.error("设置失败");
62 67
       }
63 68
     });
64 69
   }
@@ -120,13 +125,9 @@ export class HolidaysManagementComponent implements OnInit {
120 125
       .subscribe((data) => {
121 126
         // console.log(data);
122 127
         if (data.status == 200) {
123
-          that.msg.success("设置成功!", {
124
-            nzDuration: 1000,
125
-          });
128
+          that.msg.success("设置成功!");
126 129
         } else {
127
-          that.msg.error(data.msg, {
128
-            nzDuration: 1000,
129
-          });
130
+          that.msg.error(data.msg);
130 131
         }
131 132
       });
132 133
   }
@@ -144,6 +145,11 @@ export class HolidaysManagementComponent implements OnInit {
144 145
       // console.log('已切换了年/月,需重新获取当前年/月数据')
145 146
       this.initDates(value.getFullYear(), value.getMonth());
146 147
     }
148
+    console.log(
149
+      format(value, "yyyy-MM-dd"),
150
+      format(this.lastSelectMonth, "yyyy-MM-dd"),
151
+      "seimin"
152
+    );
147 153
     this.lastSelectMonth = value;
148 154
   }
149 155