冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 src/app/routes/users/alarm-user/alarm-user.component.html

@@ -5,10 +5,10 @@
         <div nz-col [nzSpan]="8" class="mb-md">
            <div nz-form-item class="d-flex">
               <div nz-form-label>
                  <label>账号</label>
                  <label>用户名</label>
               </div>
               <div nz-form-control class="flex-1">
                  <nz-input [(ngModel)]="query.name" name="name" [nzSize]="'large'" [nzPlaceHolder]="'请输入账号'"></nz-input>
                  <nz-input [(ngModel)]="query.name" name="name" [nzSize]="'large'" [nzPlaceHolder]="'请输入用户名'"></nz-input>
               </div>
            </div>
         </div>
@@ -29,7 +29,7 @@
               </div>
               <div nz-form-control class="flex-1">
                  <nz-select [(ngModel)]="query.isDelete" name="isDelete" [nzSize]="'large'">
                     <nz-option *ngFor="let option of options" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
                     <nz-option *ngFor="let option of isDeleteOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
                     </nz-select>
               </div>
            </div>
@@ -43,7 +43,7 @@
   </form>

   <div class="mb-md">
      <button nz-button (click)="add()" [nzType]="'primary'" [nzSize]="'large'">
      <button nz-button (click)="edit()" [nzType]="'primary'" [nzSize]="'large'">
         <i class="anticon anticon-plus"></i><span>新建</span>
      </button>
      <ng-container *ngIf="selectedRows.length > 0"> &nbsp;
@@ -61,7 +61,7 @@

   <nz-table   #nzTable
            [nzAjaxData]="data"
            [nzLoading]="http.loading"
            [nzLoading]="loading"
            [nzTotal]="total"
            [(nzPageIndex)]="query.pageIndex"
            [nzPageSize]="query.pageSize"
@@ -72,7 +72,7 @@
            <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>
@@ -81,7 +81,7 @@
            <th nz-th><span>创建日期</span></th>
            <th nz-th>
               <span>过期日期</span>
               <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
               <nz-table-sort [(nzValue)]="sortMap" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
            </th>
            <th nz-th><span>操作</span></th>
         </tr>
@@ -96,14 +96,14 @@
            <td nz-td>{{alarmUser.email}}</td>
            <td nz-td>{{alarmUser.weixin}}</td>
            <!-- <td nz-td>{{alarmUser.password}}</td> -->
            <td nz-td>{{alarmUser.organizationId}}</td>
            <td nz-td>{{alarmUser.organization?alarmUser.organization.name:alarmUser.organizationId}}</td>
            <td nz-td>{{format_date(alarmUser.createTime)}}</td>
            <td nz-td>{{format_date(alarmUser.expireTime)}}</td>
            <td nz-td>
               <a (click)="edit(alarmUser)">编辑</a>
               <ng-container *ngIf="alarmUser.isDelete == '0'">
                  <span nz-table-divider></span>
                  <nz-popconfirm  [nzTitle]="'确定要删除该用户吗?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(alarmUser)" >
                  <nz-popconfirm  [nzTitle]="'确定要删除该用户吗?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(alarmUser.id)" >
                     <a nz-popconfirm>删除</a>
                  </nz-popconfirm>
               </ng-container>