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 |   97 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index afe0b7b..ceab058 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -1,3 +1,94 @@
-<p>
-  installer works!
-</p>
+<pro-header [title]="'������������������'"></pro-header>
+<nz-card [nzBordered]="false">
+  <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>
+          </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-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">
+        <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>
+      </div>
+    </div>
+  </form>
+  <div class="mb-md">
+    <button nz-button (click)="add()" [nzType]="'primary'" [nzSize]="'large'">
+      <i class="anticon anticon-plus"></i><span>������</span>
+    </button>
+    <ng-container *ngIf="selectedRows.length > 0">
+      &nbsp;<button nz-button [nzSize]="'large'" (click)="remove()">������������</button>
+    </ng-container>
+  </div>
+  <div class="mb-md">
+    <nz-alert [nzType]="'info'" [nzShowIcon]="true">
+        <span alert-body>
+            ��������� <strong class="text-primary">{{selectedRows.length}}</strong> ���
+        </span>
+    </nz-alert>
+  </div>
+  <nz-table #nzTable
+            [nzDataSource]="data"
+            [nzLoading]="http.loading"
+            [nzTotal]="total"
+            [(nzPageIndex)]="q.pi"
+            [nzPageSize]="q.ps"
+            [nzShowTotal]="true"
+            (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>
+        <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expireTime', $event)"></nz-table-sort>
+      </th>
+      <th nz-th><span>������</span></th>
+    </tr>
+    </thead>
+    <tbody nz-tbody>
+    <tr nz-tbody-tr *ngFor="let i of nzTable.data">
+      <td nz-td [nzCheckbox]="true">
+        <label nz-checkbox [(ngModel)]="i.checked" (ngModelChange)="refreshStatus($event)">
+        </label>
+      </td>
+      <td nz-td>{{i.name}}</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.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)="delete(i)" >
+            <a nz-popconfirm>������</a>
+          </nz-popconfirm>
+      </td>
+    </tr>
+    </tbody>
+  </nz-table>
+</nz-card>

--
Gitblit v1.8.0