From 0e184df30a1d07a30d412e2d5fd91bc37711455d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 10 Jan 2018 10:04:33 +0800
Subject: [PATCH] 安装用户 管理
---
src/app/routes/systems/account/account.component.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 5c458ac..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>
@@ -61,7 +61,7 @@
<nz-table #nzTable
[nzAjaxData]="data"
- [nzLoading]="http.loading"
+ [nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="query.pageIndex"
[nzPageSize]="query.pageSize"
@@ -98,14 +98,14 @@
<td nz-td>{{account.email}}</td>
<td nz-td>{{account.weixin}}</td>
<!-- <td nz-td>{{account.password}}</td> -->
- <td nz-td>{{account.organizationId}}</td>
+ <td nz-td>{{account.organization?account.organization.name:account.organizationId}}</td>
<td nz-td>{{format_date(account.createTime)}}</td>
<td nz-td>{{format_date(account.expireTime)}}</td>
<td nz-td>
<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