名册分页

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchMemberController.java

@@ -12,6 +12,7 @@ import com.ruoyi.branch.domain.TBranchMemTransfer;
 import com.ruoyi.branch.domain.approve.DevTask;
 import com.ruoyi.branch.service.ITBranchMemTransferService;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
@@ -189,12 +190,13 @@ public class TBranchMemberController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('branch:member:list')")
     @GetMapping("/list")
-    public AjaxResult list(TBranchMember tBranchMember)
+    public TableDataInfo list(TBranchMember tBranchMember)
     {
-//        startPage();
-//        List<TBranchMember> list = tBranchMemberService.selectTBranchMemberList(tBranchMember);
-//        return getDataTable(list);
-        return AjaxResult.success(tBranchMemberService.selectTBranchMemberList(tBranchMember));
+        startPage();
+        List<TBranchMember> list = tBranchMemberService.selectTBranchMemberList(tBranchMember);
+        TableDataInfo dataTable = getDataTable(list);
+        dataTable.setTotal(list.size());
+        return dataTable;
     }
 
     /**

ruoyi-ui/src/views/branch/zbjs/dymc/index.vue

@@ -525,15 +525,8 @@
         this.loading = true;
         this.queryParams.memberType = 2;
         listMember(this.queryParams).then(response => {
-          // let rows = response.rows;
-          // let memberList = [];
-          // for (let i = 0; i < rows.length; i++) {
-          //   if (rows[i].memberType == "2" || rows[i].memberType == "3") {//党员、党委
-          //     memberList.push(rows[i]);
-          //   }
-          // }
-          // this.memberList = memberList;
-          this.memberList = response.data;
+          this.memberList = response.rows;
+          console.log(response)
           for (let i = 0; i < this.memberList.length; i++) {
             let posts = Array.from(this.memberList[i].posts);
             let roles = Array.from(this.memberList[i].roles);

ruoyi-ui/src/views/branch/zbjs/fzdxmc/index.vue

@@ -236,13 +236,13 @@
       </el-table-column>
     </el-table>
 
-    <!--<pagination-->
-      <!--v-show="total>0"-->
-      <!--:total="total"-->
-      <!--:page.sync="queryParams.pageNum"-->
-      <!--:limit.sync="queryParams.pageSize"-->
-      <!--@pagination="getList"-->
-    <!--/>-->
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改支部成员管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -614,7 +614,7 @@
           this.userList = userList;
           this.queryParams.memberType = 4;
           listMember(this.queryParams).then(response => {
-            this.memberList = response.data;
+            this.memberList = response.rows;
             console.log(response)
             for (let i = 0; i < this.memberList.length; i++) {
               let posts = Array.from(this.memberList[i].posts);

ruoyi-ui/src/views/branch/zbjs/sqrjjfzmc/index.vue

@@ -236,13 +236,13 @@
       </el-table-column>
     </el-table>
 
-    <!--<pagination-->
-      <!--v-show="total>0"-->
-      <!--:total="total"-->
-      <!--:page.sync="queryParams.pageNum"-->
-      <!--:limit.sync="queryParams.pageSize"-->
-      <!--@pagination="getList"-->
-    <!--/>-->
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改支部成员管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -614,7 +614,7 @@
           this.userList = userList;
           this.queryParams.memberType = 1;
           listMember(this.queryParams).then(response => {
-            this.memberList = response.data;
+            this.memberList = response.rows;
             for (let i = 0; i < this.memberList.length; i++) {
               let posts = Array.from(this.memberList[i].posts);
               let roles = Array.from(this.memberList[i].roles);

ruoyi-ui/src/views/branch/zbjs/wyhmc/index.vue

@@ -481,15 +481,7 @@
         this.loading = true;
         this.queryParams.memberType = 3;
         listMember(this.queryParams).then(response => {
-          // let rows = response.rows;
-          // let memberList = [];
-          // for (let i = 0; i < rows.length; i++) {
-          //   if (rows[i].memberType == "3") {//党委
-          //     memberList.push(rows[i]);
-          //   }
-          // }
-          // this.memberList = memberList;
-          this.memberList = response.data;
+          this.memberList = response.rows;
           for (let i = 0; i < this.memberList.length; i++) {
             let posts = Array.from(this.memberList[i].posts);
             let roles = Array.from(this.memberList[i].roles);