查看数据bug修复，修改密码功能开发

fengxiang

2018-03-23 40951bf70651c38d09a3b1f5eaddde8faa9e8c06

 src/app/routes/systems/account/account.component.html

@@ -35,8 +35,7 @@
            </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="submit" [nzType]="'primary'" [nzLoading]="loading" [nzSize]="'large'">查询</button>
            <button nz-button type="reset" [nzSize]="'large'" class="mx-sm">重置</button>
         </div>
      </div>
@@ -44,7 +43,8 @@

   <div class="mb-md">
      <button nz-button (click)="edit()" [nzType]="'primary'" [nzSize]="'large'">
         <i class="anticon anticon-plus"></i><span>新建</span>
            <i class="anticon anticon-plus"></i>
            <span>新建</span>
      </button>
      <ng-container *ngIf="selectedRows.length > 0"> &nbsp;
         <button nz-button [nzSize]="'large'" (click)="remove()" >批量删除</button>
@@ -54,38 +54,46 @@
   <div class="mb-md">
      <nz-alert [nzType]="'info'" [nzShowIcon]="true">
         <span alert-body>
             已选择<strong class="text-primary">{{selectedRows.length}}</strong>项
                已选择
                <strong class="text-primary">{{selectedRows.length}}</strong>项
         </span>
      </nz-alert>
   </div>

   <nz-table   #nzTable
            [nzAjaxData]="data"
            [nzLoading]="loading"
            [nzTotal]="total"
            [(nzPageIndex)]="query.pageIndex"
            [nzPageSize]="query.pageSize"
            [nzShowTotal]="true"
            (nzPageIndexChange)="load()">
    <nz-table #nzTable [nzAjaxData]="data" [nzLoading]="loading" [nzTotal]="total" [(nzPageIndex)]="query.pageIndex" [nzPageSize]="query.pageSize"
        [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 nz-th>
                    <span>账号</span>
            <nz-table-sort (nzValueChange)="sort('account_name', $event)"></nz-table-sort>
            </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>
                </th>
                <th nz-th>
                    <span>创建日期</span>
                </th>
            <th nz-th>
               <span>过期日期</span>
               <nz-table-sort (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
            </th>
            <th nz-th><span>操作</span></th>
                <th nz-th>
                    <span>操作</span>
                </th>
         </tr>
      </thead>
      <tbody nz-tbody>
@@ -97,7 +105,7 @@
            <td nz-td>{{account.mobile}}</td>
            <td nz-td>{{account.email}}</td>
            <td nz-td>{{account.weixin}}</td>
            <!-- <td nz-td>{{account.password}}</td> -->
                <!-- <td nz-td>{{account.Pwd}}</td> -->
            <td nz-td>{{account.organization?account.organization.name:account.organizationId}}</td>
            <td nz-td>{{format_date(account.createTime)}}</td>
            <td nz-td>{{format_date(account.expireTime)}}</td>
@@ -108,9 +116,56 @@
                  <nz-popconfirm  [nzTitle]="'确定要删除该数据吗?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(account.id)" >
                     <a nz-popconfirm>删除</a>
                  </nz-popconfirm>
                        <span nz-table-divider></span>
                        <nz-dropdown>
                            <a class="ant-dropdown-link" nz-dropdown>
                                更多
                                <i class="anticon anticon-down"></i>
                            </a>
                            <ul nz-menu>
                                <li nz-menu-item>
                                    <a (click)="showResetPwdWindow(account)">修改密码</a>
                                </li>
                            </ul>
                        </nz-dropdown>
               </ng-container>
            </td>
         </tr>
      </tbody>
   </nz-table>
</nz-card>
<!-- 修改密码弹窗 -->
<nz-modal [nzVisible]="resetPwdWindowIsVisible" [nzTitle]="'修改密码'" [nzContent]="modalContent" (nzOnCancel)="resetPwdCancel($event)"
    (nzOnOk)="resetPwdOk($event)" [nzConfirmLoading]="isResetPwdLoading">
    <ng-template #modalContent>
        <form nz-form [formGroup]="resetPwdForm">
            <div nz-form-item nz-row>
                <div nz-form-label nz-col [nzSm]="6" [nzXs]="24">
                    <label for="accountName" >账号</label>
                </div>
                <div nz-form-control nz-col [nzSm]="14" [nzXs]="24" nzHasFeedback>
                    <nz-input [nzSize]="'large'" nzReadonly="true" formControlName="accountName" [nzId]="'accountName'"></nz-input>
                </div>
            </div>
            <div nz-form-item nz-row>
                <div nz-form-label nz-col [nzSm]="6" [nzXs]="24">
                    <label for="password" nz-form-item-required>密码</label>
                </div>
                <div nz-form-control nz-col [nzSm]="14" [nzXs]="24" nzHasFeedback>
                    <nz-input [nzSize]="'large'" formControlName="password" [nzType]="'password'" [nzId]="'password'" (ngModelChange)="updateConfirmValidator()"></nz-input>
                    <div nz-form-explain *ngIf="getFormControl('password').dirty&&getFormControl('password').hasError('required')">请输入密码!</div>
                </div>
            </div>
            <div nz-form-item nz-row>
                <div nz-form-label nz-col [nzSm]="6" [nzXs]="24">
                    <label for="checkPassword" nz-form-item-required>确认密码</label>
                </div>
                <div nz-form-control nz-col [nzSm]="14" [nzXs]="24" nzHasFeedback>
                    <nz-input [nzSize]="'large'" formControlName="checkPassword" [nzType]="'password'" [nzId]="'checkPassword'"></nz-input>
                    <div nz-form-explain *ngIf="getFormControl('checkPassword').dirty&&getFormControl('checkPassword').hasError('required')">请确认密码!</div>
                    <div nz-form-explain *ngIf="getFormControl('checkPassword').dirty&&getFormControl('checkPassword').hasError('confirm')">两次输入不一致!</div>
                </div>
            </div>
        </form>
    </ng-template>
</nz-modal>