소스 검색

新功能BUG修复

seimin 3 년 전
부모
커밋
1c3c317846

+ 12 - 5
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1397,12 +1397,19 @@ export class HushijiandanComponent implements OnInit {
1397 1397
   }
1398 1398
   // 需要预约建单-事件
1399 1399
   yyInspectChange(e) {
1400
-    if (this.filterLinkCheckLis.length) {
1401
-      this.showDateTime();
1400
+    if (this.currentTasktype.associationType.value === "inspect") {
1401
+      //陪检
1402
+      if (this.filterLinkCheckLis.length) {
1403
+        this.showDateTime();
1404
+      } else {
1405
+        this.yyTime = null;
1406
+        this.yyDate = new Date();
1407
+        console.log(this.isYyInspect);
1408
+      }
1402 1409
     } else {
1403
-      this.yyTime = null;
1404
-      this.yyDate = null;
1405
-      console.log(this.isYyInspect);
1410
+      //转运
1411
+      this.yyTimeZy = null;
1412
+      this.yyDateZy = new Date();
1406 1413
     }
1407 1414
   }
1408 1415
   //回显时间日期

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

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

+ 4 - 1
src/app/views/office-management/office-management.component.ts

@@ -193,6 +193,7 @@ export class OfficeManagementComponent implements OnInit {
193 193
 
194 194
   // 切换楼栋信息
195 195
   floors: Array<any> = []; //楼层
196
+  floorLoading: boolean = false;
196 197
   changeBuilding(buildingId?, obj?) {
197 198
     var that = this;
198 199
     that.floors = [];
@@ -207,7 +208,9 @@ export class OfficeManagementComponent implements OnInit {
207 208
     let data = {
208 209
       buildingId: bid,
209 210
     };
211
+    this.floorLoading = true;
210 212
     that.mainService.getBuildingOrFloor("floor", data).subscribe((data) => {
213
+      this.floorLoading = false;
211 214
       this.message.remove(this.maskFlag);
212 215
       this.maskFlag = false;
213 216
       this.modal = true;
@@ -500,7 +503,6 @@ export class OfficeManagementComponent implements OnInit {
500 503
   confirmDel() {
501 504
     var that = this;
502 505
     that.btnLoading = true;
503
-    that.delModal = false;
504 506
     that.mainService
505 507
       .coopData(
506 508
         "rmvData",
@@ -509,6 +511,7 @@ export class OfficeManagementComponent implements OnInit {
509 511
       )
510 512
       .subscribe((data) => {
511 513
         that.btnLoading = false;
514
+        that.delModal = false;
512 515
         if (data.status == 200) {
513 516
           if (
514 517
             that.listOfData.length == 1 &&