新功能BUG修复

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

@@ -1397,12 +1397,19 @@ export class HushijiandanComponent implements OnInit {
   }
   // 需要预约建单-事件
   yyInspectChange(e) {
-    if (this.filterLinkCheckLis.length) {
-      this.showDateTime();
+    if (this.currentTasktype.associationType.value === "inspect") {
+      //陪检
+      if (this.filterLinkCheckLis.length) {
+        this.showDateTime();
+      } else {
+        this.yyTime = null;
+        this.yyDate = new Date();
+        console.log(this.isYyInspect);
+      }
     } else {
-      this.yyTime = null;
-      this.yyDate = null;
-      console.log(this.isYyInspect);
+      //转运
+      this.yyTimeZy = null;
+      this.yyDateZy = new Date();
     }
   }
   //回显时间日期

src/app/views/office-management/office-management.component.html

@@ -142,7 +142,7 @@
             </nz-form-control>
             <nz-form-control style="display: inline-block;">
               <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
-                nzAllowClear formControlName="floor" nzPlaceHolder="请选择楼层">
+                nzAllowClear formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
                 <nz-option nzLabel="{{data.floorName}}" nzValue="{{data.id}}" *ngFor="let data of floors"></nz-option>
               </nz-select>
             </nz-form-control>

src/app/views/office-management/office-management.component.ts

@@ -193,6 +193,7 @@ export class OfficeManagementComponent implements OnInit {
 
   // 切换楼栋信息
   floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
   changeBuilding(buildingId?, obj?) {
     var that = this;
     that.floors = [];
@@ -207,7 +208,9 @@ export class OfficeManagementComponent implements OnInit {
     let data = {
       buildingId: bid,
     };
+    this.floorLoading = true;
     that.mainService.getBuildingOrFloor("floor", data).subscribe((data) => {
+      this.floorLoading = false;
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       this.modal = true;
@@ -500,7 +503,6 @@ export class OfficeManagementComponent implements OnInit {
   confirmDel() {
     var that = this;
     that.btnLoading = true;
-    that.delModal = false;
     that.mainService
       .coopData(
         "rmvData",
@@ -509,6 +511,7 @@ export class OfficeManagementComponent implements OnInit {
       )
       .subscribe((data) => {
         that.btnLoading = false;
+        that.delModal = false;
         if (data.status == 200) {
           if (
             that.listOfData.length == 1 &&