feat:接入添加小组成员数据

src/components/drawers/MemberList.vue

@@ -38,10 +38,33 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" @click="showStuAdd" style="margin-right: 20px">
+          <!-- <div
+            class="btn btn1"
+            @click="showStuAdd"
+            style="margin-right: 20px; color: #fff"
+          >
             <div class="img1"></div>
+            
             <div class="wz">添加组员</div>
-          </div>
+          </div> -->
+          <CommonStudent
+            :type="1"
+            title="添加组员"
+            @finash="submitCall"
+            :isGroup="true"
+            :id="projectId"
+            :groupId="chooseGroupId"
+            :groupName="chooseGroupName"
+          >
+            <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
+              <template #icon
+                ><img
+                  style="margin-right: 10px"
+                  src="../../assets/images/courseManage/add0.png"
+              /></template>
+              添加组员
+            </a-button></CommonStudent
+          >
           <div class="btn btn2" @click="showModal">
             <div class="img3"></div>
             <div class="wz">批量删除</div>
@@ -148,32 +171,31 @@
         </div>
       </a-modal>
       <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
-      <add-group-members
+      <!-- <add-group-members
         v-model:AGMembers="Stuvisible"
         :chooseGroupId="chooseGroupId"
         :projectId="projectId"
         @getStuPro="getStu"
-      />
+      /> -->
     </div>
   </a-drawer>
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import { toRefs, reactive, watch } from "vue";
 // import StuAdd from "./StuAdd.vue";
-import {
-  // getProjStu,
-  removeGroupStudent,
-  groupMemberList,
-} from "../../api/indexProjStu";
+// import { getProjStu } from "../../api/indexProjStu";
+import { groupMemberList, delGroupStudent } from "@/api/index1";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
-import AddGroupMembers from "./AddGroupMembers.vue";
+// import AddGroupMembers from "./AddGroupMembers.vue";
+import CommonStudent from "@/components/student/CommonStudent";
 export default {
   name: "MemberList",
   components: {
     // StuAdd,
-    AddGroupMembers,
+    // AddGroupMembers,
+    CommonStudent,
   },
   props: {
     Lvisible: {
@@ -184,6 +206,10 @@ export default {
       type: Number,
       default: null,
     },
+    chooseGroupName: {
+      type: String,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -224,7 +250,7 @@ export default {
           dataIndex: "name",
           key: "name",
           width: 40,
-          align: "left",
+          align: "center",
           className: "h head",
         },
         {
@@ -272,6 +298,8 @@ export default {
           },
         },
       ],
+      addAuthList: [], //学员
+      authClassify: 3,
     });
     const closeDrawer = () => {
       ctx.emit("update:Lvisible", false);
@@ -295,7 +323,7 @@ export default {
         studentIds: state.selectedRows,
       };
 
-      removeGroupStudent(obj)
+      delGroupStudent(obj)
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
@@ -329,9 +357,9 @@ export default {
           group: value.groupName, //小组名
           studentId: value.studentId, //学生id
           currentStageId: value.currentStageId, //当前关卡id
-          name: value.name, //用户名
-          bum: value.userInfoBo.deptName, //部门
-          gangw: value.userInfoBo.jobName, //岗位
+          name: value.studentName, //用户名
+          bum: value.studentDepartName, //部门
+          gangw: value.studentJobName, //岗位
           completeStageCnt: value.completeStageCnt, //当前完成阶段数
           totalStageCnt: value.totalStageCnt, //总阶段数
           progress: value.completeStageCnt + "/" + value.totalStageCnt,
@@ -344,8 +372,9 @@ export default {
     };
     //获取组员列表
     const getStu = (obj) => {
+      console.log("获取学员");
       let objf = obj || {
-        studentName: "",
+        studentName: state.name,
         pageNo: state.currentPage,
         pageSize: 10,
         pid: props.projectId,
@@ -357,7 +386,8 @@ export default {
         if (res.data.code === 200) {
           state.total = res.data.data.total;
           state.tableDataTotal = res.data.data.total;
-          let arr = res.data.data.rows;
+          let arr = res.data.data.records;
+          console.log("获取小组学员", arr);
           getTableDataList(arr);
         }
         // let leng = res.data.data.rows.length;
@@ -410,33 +440,31 @@ export default {
     };
     //学员搜索
     const searchStu = () => {
-      let obj = {
-        deptIds: [], //部门
-        groupName: "",
-        name: state.name,
-        pageNo: state.currentPage,
-        pageSize: 10,
-        projectId: props.projectId,
-        topFlag: "",
-      };
+      // let obj = {
+      //   studentName: state.name,
+      //   pageNo: state.currentPage,
+      //   pageSize: 10,
+      //   pid: props.projectId,
+      //   groupId: props.chooseGroupId, //暂时写死
+      // };
       //重新获取列表
-      getStu(obj);
+      getStu();
     };
     //重置
     const resetSearch = () => {
       state.name = null;
-      let obj = {
-        deptIds: [], //部门
-        groupName: "",
-        name: "",
-        pageNo: 1,
-        pageSize: 10,
-        projectId: props.projectId,
-        groupId: props.chooseGroupId,
-        topFlag: "",
-      };
+      // let obj = {
+      //   deptIds: [], //部门
+      //   groupName: "",
+      //   name: "",
+      //   pageNo: 1,
+      //   pageSize: 10,
+      //   projectId: props.projectId,
+      //   groupId: props.chooseGroupId,
+      //   topFlag: "",
+      // };
       //重新获取列表
-      getStu(obj);
+      getStu();
     };
     const deleteOne = (id) => {
       // console.log(id, "fewfew");
@@ -459,7 +487,7 @@ export default {
         studentIds: state.selectedRows,
       };
       console.log("删除小组学员obj", obj);
-      removeGroupStudent(obj)
+      delGroupStudent(obj)
         .then((res) => {
           state.deone = false;
           console.log(res, "单个删除成功");
@@ -473,6 +501,35 @@ export default {
       state.selectedRows = [];
     };
 
+    //添加学员
+    watch(
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        // let obj = {
+        //   deptList: res[1],
+        //   groupList: res[2],
+        //   projectId: state.projectId,
+        //   studentList: res[0],
+        //   projectGroupId: 0,
+        // };
+        // console.log("obj", obj);
+        // state.loading = true;
+        // api
+        //   .addStudentProject(obj)
+        //   .then((res) => {
+        //     console.log("添加学员成功", res);
+        //     message.success("添加学员成功");
+        //     getStu();
+        //   })
+        //   .catch((err) => {
+        //     console.log("添加学员失败", err);
+        //   });
+      }
+    );
+    function submitCall(flag) {
+      flag && getStu();
+    }
     return {
       ...toRefs(state),
       closeDrawer,
@@ -491,6 +548,7 @@ export default {
       deleteOne,
       closedeleone,
       yesdele,
+      submitCall,
     };
   },
 };