update

src/main/webapp/app/modal/select-person/select-person.component.html

@@ -17,8 +17,7 @@
                           (nzPageIndexChange)="changePage($event)">
                     <thead>
                     <tr>
-                        <th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate"
-                            (nzCheckedChange)="checkAll($event)"></th>
+                        <th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
                         <th>姓名</th>
                         <th>手机号码</th>
                     </tr>

src/main/webapp/app/system/examine/examine.component.html

@@ -36,7 +36,7 @@
 </div>
 <nz-tabset (nzSelectedIndexChange)="changeIndex($event)" [nzTabPosition]="'top'" [nzType]="'card'">
   <nz-tab nzTitle="待审批">
-    <nz-table #basicTable [nzData]="noList" [nzFrontPagination]="false" [nzTotal]="totalNumNo" [nzPageIndex]="pageNoNo" [nzPageSize]="pageSize" (nzPageIndexChange)="changeNoPage($event)">
+    <nz-table #basicTable1 [nzData]="noList" [nzFrontPagination]="false" [nzTotal]="totalNumNo" [nzPageIndex]="pageNoNo" [nzPageSize]="pageSize" (nzCurrentPageDataChange)="currentPageDataChange($event)" (nzPageIndexChange)="changeNoPage($event)">
       <thead>
       <tr>
         <th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate" (nzCheckedChange)="checkAll($event)"></th>
@@ -49,8 +49,8 @@
       </tr>
       </thead>
       <tbody>
-      <tr *ngFor="let data of noList">
-        <td nzShowCheckbox [(nzChecked)]="data.checked" [nzDisabled]="data.disabled" (nzCheckedChange)="selectItem(data,$event)"></td>
+      <tr *ngFor="let data of basicTable1.data">
+        <td nzShowCheckbox [(nzChecked)]="data.checked" (nzCheckedChange)="refreshStatus($event)"></td>
         <td>{{data.createUserName}}</td>
         <td>{{data.comment}}</td>
         <td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>
@@ -87,7 +87,7 @@
     </nz-table>
   </nz-tab>
   <nz-tab nzTitle="已审批">
-    <nz-table #basicTable [nzData]="areadyList" [nzFrontPagination]="false" [nzTotal]="totalNumAlready" [nzPageIndex]="pageNoAlready" [nzPageSize]="pageSize" (nzPageIndexChange)="changeAlreadyPage($event)">
+    <nz-table #basicTable2 [nzData]="areadyList" [nzFrontPagination]="false" [nzTotal]="totalNumAlready" [nzPageIndex]="pageNoAlready" [nzPageSize]="pageSize" (nzPageIndexChange)="changeAlreadyPage($event)">
       <thead>
       <tr>
         <th>操作用户</th>
@@ -99,7 +99,7 @@
       </tr>
       </thead>
       <tbody>
-      <tr *ngFor="let data of basicTable.data">
+      <tr *ngFor="let data of basicTable2.data">
         <td>{{data.createUserName}}</td>
         <td>{{data.comment}}</td>
         <td>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</td>

src/main/webapp/app/system/examine/examine.component.ts

@@ -26,9 +26,9 @@ export class ExamineComponent implements OnInit {
     totalNumNo;
     noList = [];
 
-    allChecked;
-    indeterminate;
-    displayData = [];
+    allChecked = false;
+    indeterminate = false;
+    displayData: Array<{ id: string; checked: boolean }> = [];
 
     selectList = [];
     menuList = [];
@@ -39,36 +39,22 @@ export class ExamineComponent implements OnInit {
                 private layoutSer:LayoutService) {
     }
 
-    currentPageDataChange($event: Array<{ entityName: string; checked: boolean; disabled: boolean; }>): void {
+    currentPageDataChange($event: Array<{ id: string; checked: boolean }>): void {
         this.displayData = $event;
         this.refreshStatus();
     }
 
-    selectItem(item,e){
-        if(e){
-            this.selectList.push(item.id);
-        }else{
-            this.selectList.forEach((value,index)=>{
-                if(value == item.id){
-                    this.selectList.splice(index,1)
-                }
-            });
-        }
-        this.refreshStatus()
-    }
-
     refreshStatus(): void {
-        const allChecked = this.displayData.filter(value => !value.disabled).every(value => value.checked === true);
-        const allUnChecked = this.displayData.filter(value => !value.disabled).every(value => !value.checked);
+        const allChecked = this.displayData.every(value => value.checked === true);
+        const allUnChecked = this.displayData.every(value => !value.checked);
         this.allChecked = allChecked;
         this.indeterminate = (!allChecked) && (!allUnChecked);
+        console.log(this.indeterminate);
     }
 
     checkAll(value: boolean): void {
         this.displayData.forEach(data => {
-            if (!data.disabled) {
                 data.checked = value;
-            }
         });
         this.refreshStatus();
     }
@@ -150,12 +136,18 @@ export class ExamineComponent implements OnInit {
 
     //审批通过
     approvalPass(){
-        if(this.selectList.length == 0){
-            this.message.warning("请选择需要审核数据")
+        let arr = [];
+        this.displayData.forEach(e => {
+            if (e.checked) {
+                arr.push(e.id);
+            }
+        });
+        if(arr.length == 0){
+            this.message.warning('请选择需要审核数据');
             return false;
         }
         this.commonSer.confirmThing("通过","确定通过所选请求",()=>{
-            this.systemSer.approvalPass(this.selectList).subscribe(
+            this.systemSer.approvalPass(arr).subscribe(
                 (res)=>{
                     if(res.errCode == 10000){
                         this.message.success("已通过");
@@ -172,12 +164,18 @@ export class ExamineComponent implements OnInit {
 
     //审批不通过
     approvalUnPass(){
-        if(this.selectList.length == 0){
+        let arr = [];
+        this.displayData.forEach(e => {
+            if (e.checked) {
+                arr.push(e.id);
+            }
+        });
+        if(arr.length == 0){
             this.message.warning("请选择需要审核数据")
             return false;
         }
         this.commonSer.confirmThing("退回","确定拒绝所选请求",()=>{
-            this.systemSer.approvUnPass(this.selectList).subscribe(
+            this.systemSer.approvUnPass(arr).subscribe(
                 (res)=>{
                     if(res.errCode == 10000){
                         this.message.success("退回成功");
@@ -194,12 +192,18 @@ export class ExamineComponent implements OnInit {
 
     //审批取消
     approvalCancle(){
-        if(this.selectList.length == 0){
+        let arr = [];
+        this.displayData.forEach(e => {
+            if (e.checked) {
+                arr.push(e.id);
+            }
+        });
+        if(arr.length == 0){
             this.message.warning("请选择需要审核数据")
             return false;
         }
         this.commonSer.confirmThing("撤回","确定取消所选请求",()=>{
-            this.systemSer.approvCancle(this.selectList).subscribe(
+            this.systemSer.approvCancle(arr).subscribe(
                 (res)=>{
                     if(res.errCode == 10000){
                         this.message.success("撤回成功");

src/main/webapp/app/system/group/group.component.ts

@@ -168,22 +168,16 @@ export class GroupComponent implements OnInit {
 
     //删除用户-- 批量
     batchDelete() {
-        let bool = false;
+        let arr = [];
         this.dataSet.forEach(e => {
             if (e.checked) {
-                bool = true;
+                arr.push(e.id);
             }
         });
-        if (!bool) {
+        if(arr.length == 0){
             this.message.warning('请选择需要删除的用户');
             return false;
         }
-        let arr = [];
-        this.dataSet.forEach(e => {
-            if (e.checked) {
-                arr.push(e.id);
-            }
-        });
         this.commonSer.confirmThing('删除', '确定删除选择的用户', () => {
             this.systemSer.batchDeleteUser(arr).subscribe(
                 (res) => {