用户管理，角色管理列表翻页无效问题解决

src/app/pages/system-management/operation-logs/operation-logs.component.html

@@ -14,12 +14,12 @@
                     <nz-form-item>
                         <nz-form-label class="mr-1" style="vertical-align:top">时间</nz-form-label>
                         <nz-form-control style="display:inline-block">
-                            <nz-date-picker [nzShowToday]="false" class="mr-2" [nzDisabledDate]="disabledStartDate" nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss"
+                            <nz-date-picker [nzShowToday]="false" class="mr-2" [nzDisabledDate]="disabledStartDate"
-                                [(ngModel)]="startValue" nzPlaceHolder="请选择开始时间" (ngModelChange)="onStartChange($event)"
+                                nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="startValue" nzPlaceHolder="请选择开始时间"
-                                (nzOnOpenChange)="handleStartOpenChange($event)">
+                                (ngModelChange)="onStartChange($event)" (nzOnOpenChange)="handleStartOpenChange($event)">
                             </nz-date-picker>
-                            <nz-date-picker [nzShowToday]="false" [nzDisabledDate]="disabledEndDate" nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss"
+                            <nz-date-picker [nzShowToday]="false" [nzDisabledDate]="disabledEndDate" nzShowTime
-                                [(ngModel)]="endValue" nzPlaceHolder="请选择结束时间" [nzOpen]="endOpen"
+                                nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="endValue" nzPlaceHolder="请选择结束时间" [nzOpen]="endOpen"
                                 (ngModelChange)="onEndChange($event)" (nzOnOpenChange)="handleEndOpenChange($event)">
                             </nz-date-picker>
                         </nz-form-control>
@@ -48,7 +48,7 @@
                     </thead>
                     <tbody>
                         <tr *ngFor="let item of dataSet.data;let i=index">
-                            <td>{{i+1}}</td>
+                            <td>{{(search.page_index - 1)*search.page_size+i+1}}</td>
                             <td>{{item.user_name}}</td>
                             <td>{{item.model_name}}</td>
                             <td>{{item.summary}}</td>

src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html

@@ -68,11 +68,31 @@
 </div>
 <!-- 机构负责人选择 -->
 <div class="org-selete-box">
-    <nz-drawer [nzBodyStyle]="{ height: 'calc(100% - 55px)', overflow: 'auto', 'padding-bottom':'53px' }" [nzWidth]="auto"
+    <nz-drawer [nzBodyStyle]="{ height: 'calc(100% - 55px)', overflow: 'auto', 'padding-bottom':'53px' }" [nzWidth]="460"
         [nzVisible]="visibleUsers" nzTitle="角色用户" (nzOnClose)="closeUser()">
         <div class="users-box" [hidden]='statusParamsUsers.status!=3'>
             <div class="user-table-box">
-                <nz-table nzBordered [nzShowPagination]='false' #dataSet [nzData]="userData">
+                <nz-table nzBordered #dataSet [nzFrontPagination]="false" [nzData]="userData" [nzTotal]="collectionSize"
+                    [(nzPageIndex)]="search.page_index" [(nzPageSize)]="search.page_size" (nzPageIndexChange)="queryTable()">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th>姓名</th>
+                            <th>用户名</th>
+                            <th>电话</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr *ngFor="let item of dataSet.data">
+                            <td nzShowCheckbox [(nzChecked)]="item.checked" [nzDisabled]="item.disabled"></td>
+                            <td>{{item.real_name}}</td>
+                            <td>{{item.login_name}}</td>
+                            <td>{{item.mobile}}</td>
+                        </tr>
+                    </tbody>
+                </nz-table>
+
+                <!-- <nz-table nzBordered [nzShowPagination]='false' #dataSet [nzData]="userData">
                     <thead>
                         <tr>
                             <th></th>
@@ -93,7 +113,7 @@
                 <div class="page-box" *ngIf="statusParamsUsers.status==3">
                     <nz-pagination [nzPageIndex]="search.page_index" (nzPageIndexChange)='pageChange($event)'
                         [nzPageSize]='search.page_size' [nzTotal]="collectionSize"></nz-pagination>
-                </div>
+                </div> -->
             </div>
             <div class="drawer-footer">
                 <button (click)='userSave()' nz-button nzType="primary" class="mr10">保存</button>

src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts

@@ -213,11 +213,7 @@ export class RoleManagementModifyComponent implements OnInit {
     closeUser(): void {
         this.visibleUsers = false;
     }
-    //翻页
+
-    pageChange(event) {
-        this.search.page_index = event;
-        this.queryTable();
-    }
     //获取用户列表
     queryTable(): void {
         this.statusParamsUsers.status = 1;

src/app/pages/system-management/role-management/role-management.component.html

@@ -23,7 +23,35 @@
             <nz-divider></nz-divider>
             <app-request-status *ngIf='statusParamsTable.status!=4' [statusParams]='statusParamsTable'></app-request-status>
             <div class="table-box" *ngIf='statusParamsTable.status==3||statusParamsTable.status==4||statusParamsTable.status==0'>
-                <nz-table nzBordered [nzShowPagination]='false' #dataSet [nzData]="tableData">
+                <nz-table nzBordered #dataSet [nzFrontPagination]="false" [nzData]="tableData" [nzTotal]="collectionSize"
+                    [(nzPageIndex)]="search.page_index" [(nzPageSize)]="search.page_size" (nzPageIndexChange)="queryTable()">
+                    <thead>
+                        <tr>
+                            <th>角色名称</th>
+                            <th>角色类型</th>
+                            <th>创建人</th>
+                            <th>创建日期</th>
+                            <th>操作</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr *ngFor="let item of dataSet.data">
+                            <td>{{item.role_name}}</td>
+                            <td><span *ngIf="item.role_type==0">系统内置</span><span *ngIf="item.role_type==1">用户定义</span></td>
+                            <td>{{item.create_by}}</td>
+                            <td>{{item.create_date| date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                            <td>
+                                <i (click)="addModify(2,item)" class="table-operation-btn edit" nz-icon type="edit"
+                                    theme="outline"></i>
+                                <nz-divider nzType="vertical"></nz-divider>
+                                <i nz-popconfirm nzTitle="确定删除该角色?" nzOkText="确定" nzCancelText="取消" (nzOnConfirm)="delectConfirm(item)"
+                                    class="table-operation-btn danger" nz-icon type="delete" theme="outline"></i>
+                            </td>
+                        </tr>
+                    </tbody>
+                </nz-table>
+
+                <!-- <nz-table nzBordered [nzShowPagination]='false' #dataSet [nzData]="tableData">
                     <thead>
                         <tr>
                             <th>角色名称</th>
@@ -52,7 +80,7 @@
                 <div class="page-box" *ngIf="statusParamsTable.status==3">
                     <nz-pagination [nzPageIndex]="search.page_index" (nzPageIndexChange)='pageChange($event)'
                         [nzPageSize]='search.page_size' [nzTotal]="collectionSize"></nz-pagination>
-                </div>
+                </div> -->
             </div>
 
         </div>

src/app/pages/system-management/role-management/role-management.component.ts

@@ -56,18 +56,10 @@ export class RoleManagementComponent implements OnInit {
             }
         })
     }
-	//重置，重置搜索条件
+
-	// reset(){
-	// 	this.search.page_index=1;
-	// 	this.search.page_size=10;
-	// 	this.search.role_name='';
-	// 	this.queryTable();
-	// }
     //获取列表
     queryTable(): void {
-        this.search.page_index=1;
         this.statusParamsTable.status = 1;
-		this.tableData=[];
         this.http.get('/sysapi/setting/role/list', this.search).subscribe((json) => {
             if (json.is_success) {
                 this.tableData = json.body.list;
@@ -82,10 +74,4 @@ export class RoleManagementComponent implements OnInit {
             }
         })
     }
-	//翻页
-	pageChange(event){
-		this.search.page_index=event;
-		this.queryTable();
-	}
-
 }

src/app/pages/system-management/user-management/user-management.component.html

@@ -36,7 +36,8 @@
             <nz-divider></nz-divider>
             <app-request-status *ngIf='statusParamsTable.status!=4' [statusParams]='statusParamsTable'></app-request-status>
             <div class="table-box" *ngIf='statusParamsTable.status==3||statusParamsTable.status==4||statusParamsTable.status==0'>
-                <nz-table nzBordered [nzShowPagination]='false' #dataSet [nzData]="tableData">
+                <nz-table nzBordered #dataSet [nzFrontPagination]="false" [nzData]="tableData" [nzTotal]="collectionSize"
+                    [(nzPageIndex)]="search.page_index" [(nzPageSize)]="search.page_size" (nzPageIndexChange)="queryTable()">
                     <thead>
                         <tr>
                             <th>姓名</th>
@@ -54,16 +55,13 @@
                                 <i (click)="addModify(2,item)" class="table-operation-btn edit" nz-icon type="edit"
                                     theme="outline"></i>
                                 <nz-divider *ngIf="currentUserInfo.uid!==item.uid" nzType="vertical"></nz-divider>
-                                <i *ngIf="currentUserInfo.uid!==item.uid" nz-popconfirm nzTitle="确定删除该用户?" nzOkText="确定" nzCancelText="取消" (nzOnConfirm)="delectConfirm(item)"
+                                <i *ngIf="currentUserInfo.uid!==item.uid" nz-popconfirm nzTitle="确定删除该用户?" nzOkText="确定"
-                                    class="table-operation-btn danger" nz-icon type="delete" theme="outline"></i>
+                                    nzCancelText="取消" (nzOnConfirm)="delectConfirm(item)" class="table-operation-btn danger"
+                                    nz-icon type="delete" theme="outline"></i>
                             </td>
                         </tr>
                     </tbody>
                 </nz-table>
-                <div class="page-box" *ngIf="statusParamsTable.status==3">
-                    <nz-pagination [nzPageIndex]="search.page_index" (nzPageIndexChange)='pageChange($event)'
-                        [nzPageSize]='search.page_size' [nzTotal]="collectionSize"></nz-pagination>
-                </div>
             </div>
 
         </div>

src/app/pages/system-management/user-management/user-management.component.ts

@@ -99,17 +99,9 @@ export class UserManagementComponent implements OnInit {
     close(): void {
         this.visible = false;
     }
-	//重置，重置搜索条件
+
-	// reset(){
-	// 	this.search.page_index=1;
-	// 	this.search.page_size=10;
-	// 	this.search.real_name='';
-	// 	this.search.login_name='';
-	// 	this.queryTable();
-	// }
     //获取列表
     queryTable(): void {
-        this.search.page_index=1;
         this.statusParamsTable.status = 1;
         this.http.get('/sysapi/setting/user/list', this.search).subscribe((json) => {
             if (json.is_success) {
@@ -125,11 +117,7 @@ export class UserManagementComponent implements OnInit {
             }
         })
     }
-	//翻页
+
-	pageChange(event){
-		this.search.page_index=event;
-		this.queryTable();
-	}
     //树模型参数设置
     public zNodes: any[];
     setting = {
@@ -162,7 +150,7 @@ export class UserManagementComponent implements OnInit {
     initTree() {
         //获取目录列表
         this.statusParamsTree.status = 1;
-   		this.http.get("/sysapi/setting/organization/list",).subscribe(json=>{
+        this.http.get("/sysapi/setting/organization/list").subscribe(json => {
             if (json.is_success) {
                 if (json.body.length > 0) {
                     this.statusParamsTree.status = 3;