申请人积极分子名册 - 多个现培养人

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchMember.java

@@ -93,7 +93,7 @@ public class TBranchMember extends BaseEntity
 
     /** 现培养人 */
     @Excel(name = "现培养人")
-    private Long currentMentor;
+    private String currentMentor;
 
     /** 计划发展时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -335,12 +335,12 @@ public class TBranchMember extends BaseEntity
     {
         return formCreateTime;
     }
-    public void setCurrentMentor(Long currentMentor)
+    public void setCurrentMentor(String currentMentor)
     {
         this.currentMentor = currentMentor;
     }
 
-    public Long getCurrentMentor()
+    public String getCurrentMentor()
     {
         return currentMentor;
     }

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

@@ -214,7 +214,7 @@
           <span>{{ parseTime(scope.row.formCreateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="现培养人" align="center" prop="currentMentor" :formatter="currentMentorFormat" />
+      <el-table-column label="现培养人" align="center" prop="currentMentorString" />
       <el-table-column label="计划发展时间" align="center" prop="planDevelopDuration" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planDevelopDuration, '{y}-{m}-{d}') }}</span>
@@ -371,7 +371,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="现培养人" prop="currentMentor">
-              <el-select v-model="form.currentMentor" placeholder="请选择现培养人">
+              <el-select v-model="form.currentMentor" placeholder="请选择现培养人" multiple>
                 <el-option
                   v-for="dict in userList"
                   :key="dict.dictValue"
@@ -612,39 +612,62 @@
       /** 查询支部成员管理列表 */
       getList() {
         this.loading = true;
-        listMember(this.queryParams).then(response => {
-          let rows = response.rows;
-          let memberList = [];
+        listUserNoPage().then(response => {
+          let rows = response.data;
+          let userList = [];
           for (let i = 0; i < rows.length; i++) {
-            if (rows[i].memberType == "1") {//申请人、积极分子
-              memberList.push(rows[i]);
+            if (rows[i].userName != "admin") {
+              let user = {"dictValue": rows[i].userId, "dictLabel": rows[i].nickName};
+              userList.push(user);
             }
           }
-          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;
+          this.userList = userList;
+          listMember(this.queryParams).then(response => {
+            let rows = response.rows;
+            let memberList = [];
+            for (let i = 0; i < rows.length; i++) {
+              if (rows[i].memberType == "1") {//申请人、积极分子
+                memberList.push(rows[i]);
               }
             }
-            for (let j = 0; j < posts.length; j++) {
-              if (j > 0) {
-                postString += "\n兼" + posts[j].postName;
-              } else {
-                postString += posts[j].postName;
+            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;
+              if (this.memberList[i].currentMentor != null) {
+                let currentMentor = this.memberList[i].currentMentor.split(",");
+                let currentMentorString = "";
+                for (let j = 0; j < currentMentor.length; j++) {
+                  if (j > 0) {
+                    currentMentorString += "、" + this.selectDictLabel(this.userList, currentMentor[j]);
+                  } else {
+                    currentMentorString += this.selectDictLabel(this.userList, currentMentor[j]);
+                  }
+                }
+                this.memberList[i].currentMentorString = currentMentorString;
               }
             }
-            this.memberList[i].roleString = roleString;
-            this.memberList[i].postString = postString;
-          }
-          this.total = response.total;
-          this.loading = false;
+            this.total = response.total;
+            this.loading = false;
+          });
         });
       },
       /** 查询部门下拉树结构 */
@@ -748,12 +771,18 @@
         const memberId = row.memberId || this.ids
         getMember(memberId).then(response => {
           this.form = response.data;
+          if (this.form.currentMentor != null) {
+            this.form.currentMentor = this.form.currentMentor.split(",").map(Number);
+          }
           this.open = true;
           this.title = "修改申请人、积极分子信息";
         });
       },
       /** 提交按钮 */
       submitForm() {
+        if (this.form.currentMentor != null) {
+          this.form.currentMentor = this.form.currentMentor.join();
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.memberId != null) {