From bd1966ac64e93a610a4635c3eefd5115ab825c5b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 16 Mar 2018 13:43:17 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account.component.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index b78dc77..e66d615 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -29,7 +29,7 @@
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="query.isDelete" name="isDelete" [nzSize]="'large'">
- <nz-option *ngFor="let option of options" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
+ <nz-option *ngFor="let option of isDeleteOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
</nz-select>
</div>
</div>
@@ -105,7 +105,7 @@
<a (click)="edit(account)">������</a>
<ng-container *ngIf="account.isDelete == '0'">
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="remove(account.id)" >
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(account.id)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
</ng-container>
--
Gitblit v1.8.0