seimin %!s(int64=3) %!d(string=hai) anos
pai
achega
89550d6d56

+ 2 - 2
src/app/views/fuwutai/fuwutai.component.html

@@ -77,10 +77,10 @@
77
             nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeUnassignedBuilding($event)"
77
             nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeUnassignedBuilding($event)"
78
             (ngModelChange)="changeUnassignedBuilding($event)">
78
             (ngModelChange)="changeUnassignedBuilding($event)">
79
             <ng-container *ngFor="let option of unassignedBuildings">
79
             <ng-container *ngFor="let option of unassignedBuildings">
80
-              <nz-option *ngIf="!bLoading" [nzLabel]="option[0]+'('+option[2]+')'" [nzValue]="option[3]">
80
+              <nz-option *ngIf="!bLoading&&!b2Loading" [nzLabel]="option[0]+'('+option[2]+')'" [nzValue]="option[3]">
81
               </nz-option>
81
               </nz-option>
82
             </ng-container>
82
             </ng-container>
83
-            <nz-option *ngIf="bLoading" nzDisabled nzCustomContent>
83
+            <nz-option *ngIf="bLoading||b2Loading" nzDisabled nzCustomContent>
84
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
84
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
85
             </nz-option>
85
             </nz-option>
86
           </nz-select>
86
           </nz-select>

+ 3 - 0
src/app/views/fuwutai/fuwutai.component.ts

@@ -183,6 +183,7 @@ export class FuwutaiComponent implements OnInit {
183
       });
183
       });
184
   }
184
   }
185
   allUnassignedOrders = "";
185
   allUnassignedOrders = "";
186
+  b2Loading = false;
186
   getUnassignedBuilding2() {
187
   getUnassignedBuilding2() {
187
     if (this.user.user.scope) {
188
     if (this.user.user.scope) {
188
       this.user.user.scope.typeIds = this.user.user.scope.typeIds || [];
189
       this.user.user.scope.typeIds = this.user.user.scope.typeIds || [];
@@ -206,9 +207,11 @@ export class FuwutaiComponent implements OnInit {
206
       idx: 0,
207
       idx: 0,
207
       sum: 9999,
208
       sum: 9999,
208
     };
209
     };
210
+    this.b2Loading = true;
209
     this.mainService
211
     this.mainService
210
       .getFetchDataList("ser", "workOrder", postData)
212
       .getFetchDataList("ser", "workOrder", postData)
211
       .subscribe((result) => {
213
       .subscribe((result) => {
214
+        this.b2Loading = false;
212
         if (result.status == 200) {
215
         if (result.status == 200) {
213
           this.allUnassignedOrders = result.list
216
           this.allUnassignedOrders = result.list
214
             .map((item) => item.id)
217
             .map((item) => item.id)