From 904bca110bbd3cd7775c7dcbfabf0447f03e4c91 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 08 Jan 2018 11:55:21 +0800
Subject: [PATCH] 账户 管理
---
src/app/routes/systems/account/account.component.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 09d86a2..62d58c8 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -43,11 +43,11 @@
</form>
<div class="mb-md">
- <button nz-button (click)="add()" [nzType]="'primary'" [nzSize]="'large'">
+ <button nz-button (click)="edit()" [nzType]="'primary'" [nzSize]="'large'">
<i class="anticon anticon-plus"></i><span>������</span>
</button>
<ng-container *ngIf="selectedRows.length > 0">
- <button nz-button [nzSize]="'large'" (click)="remove()">������������</button>
+ <button nz-button [nzSize]="'large'" (click)="remove()" >������������</button>
</ng-container>
</div>
@@ -61,7 +61,7 @@
<nz-table #nzTable
[nzAjaxData]="data"
- [nzLoading]="http.loading"
+ [nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="query.pageIndex"
[nzPageSize]="query.pageSize"
@@ -72,7 +72,9 @@
<th nz-th [nzCheckbox]="true">
<label nz-checkbox [(ngModel)]="allChecked" [nzIndeterminate]="indeterminate" (ngModelChange)="checkAll($event)"></label>
</th>
- <th nz-th><span>������</span></th>
+ <th nz-th><span>������</span>
+ <nz-table-sort (nzValueChange)="sort('account_name', $event)"></nz-table-sort>
+ </th>
<th nz-th><span>������</span></th>
<th nz-th><span>������������</span></th>
<th nz-th><span>���������</span></th>
@@ -81,7 +83,7 @@
<th nz-th><span>������������</span></th>
<th nz-th>
<span>������������</span>
- <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
+ <nz-table-sort (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
</th>
<th nz-th><span>������</span></th>
</tr>
@@ -96,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)="delete(account)" >
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(account.id)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
</ng-container>
--
Gitblit v1.8.0