seimin 1 year ago
parent
commit
9a408c7622

+ 2 - 3
src/app/views/check-and-exclude-config/check-and-exclude-config.component.html

@@ -65,8 +65,7 @@
65
           <nz-form-item>
65
           <nz-form-item>
66
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="matchType">匹配方式</nz-form-label>
66
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="matchType">匹配方式</nz-form-label>
67
             <nz-form-control nzErrorTip="请选择匹配方式!">
67
             <nz-form-control nzErrorTip="请选择匹配方式!">
68
-              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="matchType" nzShowSearch nzAllowClear
69
-                nzPlaceHolder="请选择匹配方式" nzServerSearch (nzOpenChange)="changeFormEnd($event)">
68
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="matchType" nzShowSearch nzPlaceHolder="请选择匹配方式">
70
                 <ng-container *ngFor="let data of matchTypes">
69
                 <ng-container *ngFor="let data of matchTypes">
71
                   <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}">
70
                   <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}">
72
                   </nz-option>
71
                   </nz-option>
@@ -92,5 +91,5 @@
92
 </div>
91
 </div>
93
 <!-- 操作成功/失败提示框 -->
92
 <!-- 操作成功/失败提示框 -->
94
 <app-prompt-modal [content]="promptModal.content" [success]="promptModal.success" [show]="promptModal.show"
93
 <app-prompt-modal [content]="promptModal.content" [success]="promptModal.success" [show]="promptModal.show"
95
-  [info]="promptInfo">
94
+  [info]="promptModal.info">
96
 </app-prompt-modal>
95
 </app-prompt-modal>

+ 7 - 3
src/app/views/check-and-exclude-config/check-and-exclude-config.component.ts

@@ -145,13 +145,17 @@ export class CheckAndExcludeConfigComponent implements OnInit {
145
     this.validateForm.controls.matchType.setValue(data.matchType.toString());
145
     this.validateForm.controls.matchType.setValue(data.matchType.toString());
146
   }
146
   }
147
 
147
 
148
-  // 展示信息提示框(content:提示信息,success:操作是否成功,show:操作结果提示信息)
149
-  showPromptModal(content, success, show = '') {
148
+  // 展示信息提示框(content:提示信息,success:操作是否成功,info:操作结果提示信息)
149
+  showPromptModal(content, success, info = '') {
150
     this.promptModal = {
150
     this.promptModal = {
151
       content,
151
       content,
152
       success,
152
       success,
153
-      show,
153
+      show: false,
154
+      info,
154
     }
155
     }
156
+    setTimeout(() => {
157
+      this.promptModal.show = true;
158
+    }, 100);
155
 
159
 
156
     this.getList();
160
     this.getList();
157
   }
161
   }