From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop

---
 src/app/routes/users/installer/installer.component.html |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 413e329..ceab058 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>
@@ -40,29 +40,29 @@
     </nz-alert>
   </div>
   <nz-table #nzTable
-            [nzAjaxData]="data"
+            [nzDataSource]="data"
             [nzLoading]="http.loading"
             [nzTotal]="total"
             [(nzPageIndex)]="q.pi"
             [nzPageSize]="q.ps"
             [nzShowTotal]="true"
-            (nzPageIndexChange)="load()">
+            (nzPageIndexChange)="load()"
+            (nzDataChange)="dataChange($event)">
     <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>
-        <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('updatedAt',$event)"></nz-table-sort>
+        <span>������������</span>
+        <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expireTime', $event)"></nz-table-sort>
       </th>
       <th nz-th><span>������</span></th>
     </tr>
@@ -74,18 +74,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