From f01d6b7e6bf8132524c1c2821fdcbbc5ca548369 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 29 Dec 2017 16:57:22 +0800
Subject: [PATCH] 设备型号完成
---
src/app/routes/users/installer/installer.component.html | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 413e329..4e66c78 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -6,7 +6,7 @@
<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>
@@ -14,7 +14,7 @@
<div nz-form-item class="d-flex">
<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>
@@ -53,16 +53,15 @@
<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>
- <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>
@@ -74,18 +73,17 @@
</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)="edit(i)">������</a>
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="popConfirm(i)" (nzOnCancel)="popCancel()">
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(i)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
</td>
--
Gitblit v1.8.0