Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

src/app/views/new-statistics/components/search-more/search-more.component.html

@@ -21,7 +21,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="userId">维修人员</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修人员!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of userList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -63,7 +63,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.category123">
           <nz-form-label [nzSpan]="6" nzFor="category3Id">三级分类</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择三级分类!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of category3List">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -105,7 +105,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
           <nz-form-label [nzSpan]="6" nzFor="floorId">楼<span style="visibility: hidden;">囧囧</span>层</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼层!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of floorList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -119,7 +119,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.company">
           <nz-form-label [nzSpan]="6" nzFor="companyId">三方公司</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择三方公司!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCompanyInp($event)" formControlName="companyId" nzPlaceHolder="请选择三方公司" (nzOpenChange)="openChangeCompany($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCompanyInp($event)" formControlName="companyId" nzPlaceHolder="请选择三方公司" (nzOpenChange)="openChangeCompany($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of companyList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -133,7 +133,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.repairDept">
           <nz-form-label [nzSpan]="6" nzFor="repairDeptId">报修科室</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修科室!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting()">
               <ng-container *ngFor="let option of repairDeptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>

src/app/views/new-statistics/components/search-more/search-more.component.ts

@@ -126,11 +126,21 @@ export class SearchMoreComponent implements OnInit {
 
   // 防抖
   isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
   searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
 
+  // 设置标志
+  setIsSelecting(){
+    this.isSelecting = true; // 设置标志
+  }
+
   // =================维修分组===================
 
   // 维修分组搜索
@@ -165,9 +175,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeGroup(id){
+    this.setIsSelecting();
     this.userList = [];
     this.validateForm.controls.userId.setValue(null);
-    this.getUserList('', id);
+    this.getUserList();
   }
 
   // =================维修人员===================
@@ -179,8 +190,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取维修人员列表
   userList:any[] = [];
-  getUserList(keyword = '', groupId = ''){
-    if(!groupId){
+  getUserList(keyword = ''){
+    if(!this.validateForm.value.groupId){
       this.isLoading = false;
       this.userList = [];
       return;
@@ -191,7 +202,7 @@ export class SearchMoreComponent implements OnInit {
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: groupId },
+        groupdata: { id: this.validateForm.value.groupId },
         roleCodes: 'first-line support,second-line support,incident manager',
         engineer: 1,
       },
@@ -207,7 +218,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeUser(flag){
-    flag && this.getUserList('', this.validateForm.value.groupId);
+    flag && this.getUserList();
   }
 
   // =================一级分类===================
@@ -243,9 +254,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeCategory1(id){
+    this.setIsSelecting();
     this.category2List = [];
     this.validateForm.controls.category2Id.setValue(null);
-    this.getCategory2List('', id);
+    this.getCategory2List();
 
     this.category3List = [];
     this.validateForm.controls.category3Id.setValue(null);
@@ -260,8 +272,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取二级分类列表
   category2List:any[] = [];
-  getCategory2List(keyword = '', parentId = ''){
-    if(!parentId){
+  getCategory2List(keyword = ''){
+    if(!this.validateForm.value.category1Id){
       this.isLoading = false;
       this.category2List = [];
       return;
@@ -270,7 +282,7 @@ export class SearchMoreComponent implements OnInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.validateForm.value.category1Id },
       },
     };
     this.isLoading = true;
@@ -284,13 +296,14 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeCategory2(flag){
-    flag && this.getCategory2List('', this.validateForm.value.category1Id);
+    flag && this.getCategory2List();
   }
 
   changeCategory2(id){
+    this.setIsSelecting();
     this.category3List = [];
     this.validateForm.controls.category3Id.setValue(null);
-    this.getCategory3List('', id);
+    this.getCategory3List();
   }
 
   // =================三级分类===================
@@ -302,8 +315,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取三级分类列表
   category3List:any[] = [];
-  getCategory3List(keyword = '', parentId = ''){
-    if(!parentId){
+  getCategory3List(keyword = ''){
+    if(!this.validateForm.value.category2Id){
       this.isLoading = false;
       this.category3List = [];
       return;
@@ -312,7 +325,7 @@ export class SearchMoreComponent implements OnInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.validateForm.value.category2Id },
       },
     };
     this.isLoading = true;
@@ -326,7 +339,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeCategory3(flag){
-    flag && this.getCategory3List('', this.validateForm.value.category2Id);
+    flag && this.getCategory3List();
   }
 
   // =================故障来源===================
@@ -373,9 +386,10 @@ export class SearchMoreComponent implements OnInit {
   }
 
   changeBuilding(id){
+    this.setIsSelecting();
     this.floorList = [];
     this.validateForm.controls.floorId.setValue(null);
-    this.getFloorList('', id);
+    this.getFloorList();
   }
 
   // =================楼层===================
@@ -387,8 +401,8 @@ export class SearchMoreComponent implements OnInit {
 
   // 获取楼层列表
   floorList:any[] = [];
-  getFloorList(keyword = '', buildingId = ''){
-    if(!buildingId){
+  getFloorList(keyword = ''){
+    if(!this.validateForm.value.buildingId){
       this.isLoading = false;
       this.floorList = [];
       return;
@@ -398,7 +412,7 @@ export class SearchMoreComponent implements OnInit {
       sum: 20,
       floor: {
         floorName: keyword,
-        buildId : buildingId,
+        buildId : this.validateForm.value.buildingId,
       },
     };
     this.isLoading = true;
@@ -412,7 +426,7 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeFloor(flag){
-    flag && this.getFloorList('', this.validateForm.value.buildingId);
+    flag && this.getFloorList();
   }
 
   // =================三方公司===================

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -255,7 +255,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   changeCategory1(id){
     this.category2List = [];
     this.category2Id = null;
-    this.getCategory2List('', id);
+    this.getCategory2List();
   }
 
   // 获取一级分类列表
@@ -286,13 +286,13 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   openChangeCategory2(flag){
-    flag && this.getCategory2List('', this.category1Id);
+    flag && this.getCategory2List();
   }
 
   // 获取二级分类列表
   category2List:any[] = [];
-  getCategory2List(keyword = '', parentId = '') {
-    if(!parentId){
+  getCategory2List(keyword = '') {
+    if(!this.category1Id){
       this.isLoading = false;
       this.category2List = [];
       return;
@@ -301,7 +301,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       category: {
         category: keyword,
         selectType: 'mutlQuery',
-        parent: { id: parentId },
+        parent: { id: this.category1Id },
       },
     };
     this.isLoading = true;