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 |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 57015ce..e66d615 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -28,9 +28,9 @@
 						<label>������������</label>
 					</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-select>
+						<nz-select [(ngModel)]="query.isDelete" name="isDelete" [nzSize]="'large'">
+							<nz-option *ngFor="let option of isDeleteOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
+            			</nz-select>
 					</div>
 				</div>
 			</div>
@@ -43,37 +43,38 @@
 	</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"> &nbsp;
-		<button nz-button [nzSize]="'large'" (click)="remove()">������������</button>
+			<button nz-button [nzSize]="'large'" (click)="remove()" >������������</button>
 		</ng-container>
 	</div>
 
 	<div class="mb-md">
-		<nz-alert [nzType]="'info'" [nzShowIcon]="true"> 
+		<nz-alert [nzType]="'info'" [nzShowIcon]="true">
 			<span alert-body>
 				 ���������<strong class="text-primary">{{selectedRows.length}}</strong>���
-			</span> 
+			</span>
 		</nz-alert>
 	</div>
 
-	<nz-table   #nzTable 
-				[nzDataSource]="data" 
-				[nzLoading]="http.loading"
-				[nzTotal]="total" 
+	<nz-table   #nzTable
+				[nzAjaxData]="data"
+				[nzLoading]="loading"
+				[nzTotal]="total"
 				[(nzPageIndex)]="query.pageIndex"
-				[nzPageSize]="query.pageSize" 
+				[nzPageSize]="query.pageSize"
 				[nzShowTotal]="true"
-				(nzPageIndexChange)="load()"
-				(nzDataChange)="dataChange($event)">
+				(nzPageIndexChange)="load()">
 		<thead nz-thead>
 			<tr>
 				<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,8 +82,8 @@
 				<th nz-th><span>������</span></th>
 				<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>
+					<span>������������</span>
+					<nz-table-sort (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
 				</th>
 				<th nz-th><span>������</span></th>
 			</tr>
@@ -90,21 +91,21 @@
 		<tbody nz-tbody>
 			<tr nz-tbody-tr *ngFor="let account of nzTable.data">
 				<td nz-td [nzCheckbox]="true">
-					<label nz-checkbox [(ngModel)]="account.checked" (ngModelChange)="refreshStatus($event)"></label>
+					<label nz-checkbox [(ngModel)]="account.checked" (ngModelChange)="refreshStatus($event)" [nzDisabled]="account.isDelete == '1'? true : false"></label>
 				</td>
 				<td nz-td>{{account.accountName}}</td>
 				<td nz-td>{{account.mobile}}</td>
 				<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> 
+					<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)" > 
+						<span nz-table-divider></span>
+						<nz-popconfirm  [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(account.id)" >
 							<a nz-popconfirm>������</a>
 						</nz-popconfirm>
 					</ng-container>

--
Gitblit v1.8.0