From 70e75350a1a24147ddbc50f8051ba8fd510f0c3e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 13:25:59 +0800
Subject: [PATCH] 安装用户 是否删除 过滤
---
src/app/routes/users/installer/installer.component.html | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index ceab058..ae292f8 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -12,15 +12,27 @@
</div>
<div nz-col [nzSpan]="8" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label><label for="u_mobile">������</label></div>
+ <div nz-form-label><label for="u_mobile">������/������</label></div>
<div nz-form-control class="flex-1">
<nz-input [(ngModel)]="q.u_mobile" name="u_mobile" [nzSize]="'large'" [nzPlaceHolder]="'���������������'" nzId="u_mobile"></nz-input>
</div>
</div>
</div>
<div nz-col [nzSpan]="8" class="mb-md">
+ <div nz-form-item class="d-flex">
+ <div nz-form-label>
+ <label>������������</label>
+ </div>
+ <div nz-form-control class="flex-1">
+ <nz-select [(ngModel)]="q.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>
+ <div nz-col [nzSpan]="8" class="mb-md">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="loading" [nzSize]="'large'">������</button>
- <button nz-button type="reset" (click)="load(true)" [nzSize]="'large'" class="mx-sm">������</button>
+ <button nz-button type="reset" [nzSize]="'large'" class="mx-sm">������</button>
</div>
</div>
</form>
@@ -40,29 +52,27 @@
</nz-alert>
</div>
<nz-table #nzTable
- [nzDataSource]="data"
- [nzLoading]="http.loading"
+ [nzAjaxData]="data"
+ [nzLoading]="loading"
[nzTotal]="total"
[(nzPageIndex)]="q.pi"
[nzPageSize]="q.ps"
[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></th>
+ <th nz-th><span>������/������</span></th>
<th nz-th><span>������������</span></th>
<th nz-th><span>���������</span></th>
- <th nz-th><span>������</span></th>
<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('expireTime', $event)"></nz-table-sort>
+ <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
</th>
<th nz-th><span>������</span></th>
</tr>
@@ -77,7 +87,6 @@
<td nz-td>{{i.mobile}}</td>
<td nz-td>{{i.email}}</td>
<td nz-td>{{i.weixin}}</td>
- <td nz-td>{{i.password}}</td>
<td nz-td>{{i.organizationId}}</td>
<td nz-td>{{format_date(i.createTime)}}</td>
<td nz-td>{{format_date(i.expireTime)}}</td>
--
Gitblit v1.8.0