Merge branch 'master' into develop

src/app/views/regular-off-duty/regular-off-duty.component.ts

@@ -70,9 +70,10 @@ export class RegularOffDutyComponent implements OnInit {
   // 确认立即执行
   confirmExec() {
     this.btnLoading = true;
-    let posData = this.coopItem.classesIds.split(',');
+    let posData = this.coopItem.classesIds.split(",");
     this.mainService.executeNowClassesJob(posData).subscribe((result: any) => {
       this.closeExecModal();
+      this.btnLoading = false;
       if (result.status == 200) {
         this.showPromptModal("当前班次下班", true, "");
       } else {

src/app/views/round-robin/round-robin.component.ts

@@ -661,6 +661,7 @@ export class RoundRobinComponent implements OnInit {
       .executeNowOrderPlan(this.coopItem.id)
       .subscribe((result: any) => {
         this.closeExecModal();
+        this.btnLoading = false;
         if (result.status == 200) {
           this.showPromptModal("立即执行", true, "");
         } else {