From c5b814dcf5ae60e89169dadf6cb039261bb23a23 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 16:26:41 +0800
Subject: [PATCH] updates

---
 src/app/routes/users/installer/installer.component.html |   54 +++++++++++++++++++++---------------------------------
 1 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index ead720b..e0e3db3 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -1,6 +1,6 @@
 <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">
@@ -20,7 +20,7 @@
       </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" (click)="load(true)" [nzSize]="'large'" class="mx-sm">������</button>
       </div>
     </div>
   </form>
@@ -29,16 +29,7 @@
       <i class="anticon anticon-plus"></i><span>������</span>
     </button>
     <ng-container *ngIf="selectedRows.length > 0">
-      <button nz-button [nzSize]="'large'">������������</button>
-      <nz-dropdown [nzPlacement]="'bottomLeft'">
-        <button nz-button nz-dropdown [nzSize]="'large'">
-          ������������ <i class="anticon anticon-down"></i>
-        </button>
-        <ul nz-menu>
-          <li nz-menu-item (click)="remove()">������</li>
-          <li nz-menu-item (click)="approval()">������������</li>
-        </ul>
-      </nz-dropdown>
+      &nbsp;<button nz-button [nzSize]="'large'" (click)="remove()">������������</button>
     </ng-container>
   </div>
   <div class="mb-md">
@@ -48,23 +39,29 @@
         </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]="http.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>
-        <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>
@@ -76,30 +73,21 @@
         </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>{{i.createTime | _date}}</td>
+      <td nz-td>{{i.expireTime | _date}}</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)="popConfirm(i)" (nzOnCancel)="popCancel()">
+            <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