From 6a6d3bbb3748c12c2dc94beec05d21d82d0faba1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 14:43:01 +0800
Subject: [PATCH] 数据报表

---
 src/app/routes/systems/account/account.component.html |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 8c84cc4..e66d615 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -1,6 +1,6 @@
 <pro-header [title]="'������������'"></pro-header>
 <nz-card [nzBordered]="false">
-	<form nz-form [nzLayout]="'inline'">
+	<form nz-form (ngSubmit)="load(true)" [nzLayout]="'inline'">
 		<div nz-row [nzGutter]="24">
 			<div nz-col [nzSpan]="8" class="mb-md">
 				<div nz-form-item class="d-flex">
@@ -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,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"> &nbsp;
-		<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>
@@ -89,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>
 					<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