From b4f60bc9c5f2f74eee61c2fc2a639618aaf52c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Feb 2018 16:57:03 +0800
Subject: [PATCH] 更新主题系统版本
---
src/app/routes/users/installer/installer.component.html | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 0f5ba69..9f6c4ab 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -1,26 +1,26 @@
<pro-header [title]="'������������������'"></pro-header>
<nz-card [nzBordered]="false">
- <form nz-form (ngSubmit)="getData()" [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">
<div nz-form-label><label for="u_name">������</label></div>
<div nz-form-control class="flex-1">
- <nz-input [(ngModel)]="q.u_name" name="u_name" [nzSize]="'large'" [nzPlaceHolder]="'���������'" nzId="u_name"></nz-input>
+ <nz-input [(ngModel)]="q.u_name" name="u_name" [nzSize]="'large'" [nzPlaceHolder]="'���������������'" nzId="u_name"></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 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>
+ <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">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="loading" [nzSize]="'large'">������</button>
- <button nz-button type="reset" (click)="getData()" [nzSize]="'large'" class="mx-sm">������</button>
+ <button nz-button type="reset" [nzSize]="'large'" class="mx-sm">������</button>
</div>
</div>
</form>
@@ -39,23 +39,28 @@
</span>
</nz-alert>
</div>
- <nz-table #nzTable [nzDataSource]="data" [nzPageSize]="q.ps" [nzLoading]="loading" (nzDataChange)="dataChange($event)" (nzPageIndexChange)="pageChange($event)" [nzShowTotal]="true">
+ <nz-table #nzTable
+ [nzAjaxData]="data"
+ [nzLoading]="loading"
+ [nzTotal]="total"
+ [(nzPageIndex)]="q.pi"
+ [nzPageSize]="q.ps"
+ [nzShowTotal]="true"
+ (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></th>
+ <th nz-th><span>������������</span></th>
<th nz-th>
- <span>������</span>
- <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('updatedAt',$event)"></nz-table-sort>
+ <span>������������</span>
+ <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
</th>
<th nz-th><span>������</span></th>
</tr>
@@ -67,30 +72,20 @@
</label>
</td>
<td nz-td>{{i.name}}</td>
- <td nz-td>{{i.sex}}</td>
<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.organization}}</td>
- <td nz-td>{{i.nickname}}</td>
- <td nz-td>{{i.updatedAt | _date}}</td>
+ <td nz-td>{{i.organizationId}}</td>
+ <td nz-td>{{format_date(i.createTime)}}</td>
+ <td nz-td>{{format_date(i.expireTime)}}</td>
<td nz-td>
- <a (click)="msg.success('���������' + i.name)">������</a>
+ <a (click)="edit(i)">������</a>
<span nz-table-divider></span>
- <a (click)="msg.success('���������' + i.name)">������</a>
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(i)" >
+ <a nz-popconfirm>������</a>
+ </nz-popconfirm>
</td>
</tr>
</tbody>
</nz-table>
</nz-card>
-<nz-modal [nzVisible]="modalVisible" [nzTitle]="'������������'" [nzConfirmLoading]="loading" [nzContent]="modalContent" (nzOnCancel)="modalVisible=false" (nzOnOk)="save()">
- <ng-template #modalContent>
- <div nz-form-item class="d-flex">
- <div nz-form-label><label for="no">������</label></div>
- <div nz-form-control class="flex-1">
- <nz-input [(ngModel)]="description" name="description" [nzSize]="'large'" [nzPlaceHolder]="'���������'" nzId="no"></nz-input>
- </div>
- </div>
- </ng-template>
-</nz-modal>
--
Gitblit v1.8.0