支部成员管理 - 字典翻译bug fix

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

@@ -403,31 +403,33 @@
           let rows = response.rows;
           let memberList = [];
           for (let i = 0; i < rows.length; i++) {
-            if (rows[i].memberType == "2" || rows[i].memberType == "3") {//党员、党委
-              let posts = Array.from(rows[i].posts);//岗位
-              let roles = Array.from(rows[i].roles);//角色
-              let roleString = "";
-              let postString = "";
-              for (let j = 0; j < roles.length; j++) {
-                if (j > 0) {//多个角色拼接
-                  roleString += "\n兼" + roles[j].roleName;
-                } else {
-                  roleString += roles[j].roleName;
-                }
-              }
-              for (let j = 0; j < posts.length; j++) {
-                if (j > 0) {//多个岗位拼接
-                  postString += "\n兼" + posts[j].postName;
-                } else {
-                  postString += posts[j].postName;
-                }
-              }
-              rows.roleString = roleString;
-              rows.postString = postString;
+            if (rows[i].memberType == "2") {//党员
               memberList.push(rows[i]);
             }
           }
           this.memberList = memberList;
+          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);
+            let roleString = "";
+            let postString = "";
+            for (let j = 0; j < roles.length; j++) {
+              if (j > 0) {
+                roleString += "\n兼" + roles[j].roleName;
+              } else {
+                roleString += roles[j].roleName;
+              }
+            }
+            for (let j = 0; j < posts.length; j++) {
+              if (j > 0) {
+                postString += "\n兼" + posts[j].postName;
+              } else {
+                postString += posts[j].postName;
+              }
+            }
+            this.memberList[i].roleString = roleString;
+            this.memberList[i].postString = postString;
+          }
           this.total = response.total;
           this.loading = false;
         });

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

@@ -66,6 +66,7 @@
 
     <el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="党支部" align="center" prop="deptId" :formatter="deptListFormat"/>
       <el-table-column label="姓名" align="center" prop="nickName"/>
       <el-table-column label="性别" align="center" prop="sex" :formatter="sysUserSexFormat"/>
       <el-table-column label="民族" align="center" prop="ethnic" :formatter="memberEthnicFormat" />
@@ -337,7 +338,8 @@
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import { listUser} from "@/api/system/user";
+  import { listUser } from "@/api/system/user";
+  import { listDept } from "@/api/system/dept";
 
   export default {
     name: "Member",
@@ -375,6 +377,8 @@
         memberEthnicOptions: [],
         // 用户列表
         userList: [],
+        // 部门列表
+        deptList: [],
         // 用户导入参数
         upload: {
           // 是否显示弹出层（用户导入）
@@ -453,8 +457,21 @@
         this.memberEthnicOptions = response.data;
       });
       this.getUserList();
+      this.getDeptList();
     },
     methods: {
+      /** 查询部门列表 */
+      getDeptList() {
+        listDept().then(response => {
+          let data = response.data;
+          let deptList = [];
+          for(let i = 0; i < data.length; i++) {
+            let dept = { "dictValue" : data[i].deptId, "dictLabel" : data[i].deptName};
+            deptList.push(dept);
+          }
+          this.deptList = deptList;
+        });
+      },
       /** 查询用户列表 */
       getUserList() {
         listUser().then(response => {
@@ -477,30 +494,32 @@
           let memberList = [];
           for (let i = 0; i < rows.length; i++) {
             if (rows[i].memberType == "1") {//申请人、积极分子
-              let posts = Array.from(rows[i].posts);//岗位
-              let roles = Array.from(rows[i].roles);//角色
-              let roleString = "";
-              let postString = "";
-              for (let j = 0; j < roles.length; j++) {
-                if (j > 0) {//多个角色拼接
-                  roleString += "\n兼" + roles[j].roleName;
-                } else {
-                  roleString += roles[j].roleName;
-                }
-              }
-              for (let j = 0; j < posts.length; j++) {
-                if (j > 0) {//多个岗位拼接
-                  postString += "\n兼" + posts[j].postName;
-                } else {
-                  postString += posts[j].postName;
-                }
-              }
-              rows.roleString = roleString;
-              rows.postString = postString;
               memberList.push(rows[i]);
             }
           }
           this.memberList = memberList;
+          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);
+            let roleString = "";
+            let postString = "";
+            for (let j = 0; j < roles.length; j++) {
+              if (j > 0) {
+                roleString += "\n兼" + roles[j].roleName;
+              } else {
+                roleString += roles[j].roleName;
+              }
+            }
+            for (let j = 0; j < posts.length; j++) {
+              if (j > 0) {
+                postString += "\n兼" + posts[j].postName;
+              } else {
+                postString += posts[j].postName;
+              }
+            }
+            this.memberList[i].roleString = roleString;
+            this.memberList[i].postString = postString;
+          }
           this.total = response.total;
           this.loading = false;
         });
@@ -531,6 +550,10 @@
       userListFormat(row, column) {
         return this.selectDictLabel(this.userList, row.userId);
       },
+      // 部门列表字典翻译
+      deptListFormat(row, column) {
+        return this.selectDictLabel(this.deptList, row.deptId);
+      },
       // 现培养人字典翻译
       currentMentorFormat(row, column) {
         return this.selectDictLabel(this.userList, row.currentMentor);

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

@@ -408,31 +408,33 @@
           let rows = response.rows;
           let memberList = [];
           for (let i = 0; i < rows.length; i++) {
-            if (rows[i].memberType == "3") {//党委
-              let posts = Array.from(rows[i].posts);//岗位
-              let roles = Array.from(rows[i].roles);//角色
-              let roleString = "";
-              let postString = "";
-              for (let j = 0; j < roles.length; j++) {
-                if (j > 0) {//多个角色拼接
-                  roleString += "\n兼" + roles[j].roleName;
-                } else {
-                  roleString += roles[j].roleName;
-                }
-              }
-              for (let j = 0; j < posts.length; j++) {
-                if (j > 0) {//多个岗位拼接
-                  postString += "\n兼" + posts[j].postName;
-                } else {
-                  postString += posts[j].postName;
-                }
-              }
-              rows.roleString = roleString;
-              rows.postString = postString;
+            if (rows[i].memberType == "2" || rows[i].memberType == "3") {//党员、党委
               memberList.push(rows[i]);
             }
           }
           this.memberList = memberList;
+          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);
+            let roleString = "";
+            let postString = "";
+            for (let j = 0; j < roles.length; j++) {
+              if (j > 0) {
+                roleString += "\n兼" + roles[j].roleName;
+              } else {
+                roleString += roles[j].roleName;
+              }
+            }
+            for (let j = 0; j < posts.length; j++) {
+              if (j > 0) {
+                postString += "\n兼" + posts[j].postName;
+              } else {
+                postString += posts[j].postName;
+              }
+            }
+            this.memberList[i].roleString = roleString;
+            this.memberList[i].postString = postString;
+          }
           this.total = response.total;
           this.loading = false;
         });