From 5adf16c199e17687fc952c78a40c7bbc609d09d7 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 18 Feb 2023 00:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E7=BB=84=E5=91=98=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E8=B6=85=E8=BF=87=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue    |  7 ++++++-
 src/components/drawers/SubsetManage.vue  |  2 +-
 src/components/student/CommonStudent.vue | 16 +++++++++++++++-
 src/views/projectcenter/TaskPage.vue     | 22 ++++++++++++++--------
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 626323c8..8b474718 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -55,6 +55,8 @@
             :id="projectId"
             :groupId="chooseGroupId"
             :groupName="chooseGroupName"
+            :groupMemberCount="groupMemberCount"
+            :groupMemberNumber="total"
           >
             <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
               <template #icon
@@ -210,6 +212,10 @@ export default {
       type: String,
       default: null,
     },
+    groupMemberCount: {
+      type: Number,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -372,7 +378,6 @@ export default {
     };
     //获取组员列表
     const getStu = (obj) => {
-      console.log("获取学员");
       let objf = obj || {
         studentName: state.name,
         pageNo: state.currentPage,
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 0908830e..557497be 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -143,7 +143,7 @@ export default {
     };
     //添加小组
     const addGroup = () => {
-      state.loading = true
+      state.loading = true;
       console.log("state.groupNum2", state.groupNum2);
       let obj = {
         pid: props.projectId,
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 015cda24..8deed558 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -430,6 +430,7 @@
   </a-modal>
 </template>
 <script setup>
+  import {message} from "ant-design-vue";
 import { computed, defineEmits, defineProps, ref, watch } from "vue";
 import { boeRequest, useBoeApi, useBoeApiPage } from "@/api/request";
 import {
@@ -484,6 +485,14 @@ const props = defineProps({
     type: String,
     default: null,
   },
+  groupMemberCount: {
+    type: Number,
+    default: null,
+  },
+  groupMemberNumber: {
+    type: Number,
+    default: null,
+  },
 });
 // 获取项目学员;
 const procurrentPage = ref(1);
@@ -888,6 +897,11 @@ const submitAuth = () => {
 };
 
 function handleStageOk() {
+  debugger
+  // 判断添加人数是否已超过限制人数
+  if (props.groupMemberCount < selectsData.value.projectMemberList.length + props.groupMemberNumber) {
+    return message.warning("添加小组学员超过最大值");
+  }
   stageVisible.value = false;
   visiable.value = false;
   emit("finash", false);
@@ -1186,4 +1200,4 @@ watch(visiable, () => {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ea289674..2e8a0727 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -18,7 +18,7 @@
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
-        /> 
+        />
         <div
           class="line"
           v-if="
@@ -126,7 +126,7 @@
         <!-- 已结束的显示 -->
         <!-- <div class="pub" style="width: 28px" v-if="action == -1">
           {{ act }}
-        </div> 
+        </div>
         <div class="line"></div>
         <img
           style="margin-right: 15px"
@@ -141,7 +141,7 @@
             <div class="sammo">复制</div>
           </div>
         </div> -->
-        <!-- 草稿/未发布的显示 
+        <!-- 草稿/未发布的显示
         <div class="more" v-if="action == 0">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
@@ -150,7 +150,7 @@
             <div class="sammo" @click="showStartModal">存为模板</div>
           </div>
         </div>-->
-        <!-- 已发布的显示 
+        <!-- 已发布的显示
         <div class="more" v-if="action == 1">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
@@ -160,7 +160,7 @@
             <div class="sammo" @click="showStartModal">存为模板</div>
           </div>
         </div>-->
-        <!-- 已结束的显示 
+        <!-- 已结束的显示
         <div class="more" v-if="action == -1">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
@@ -808,7 +808,7 @@
                       <div
                           class="grofooter"
                           @click="
-                          showMemberList(item.projectGroupId, item.groupName)
+                          showMemberList(item.projectGroupId, item.groupName, item.groupMemberCount)
                         "
                       >
                         <div class="ftext">组员名单 ></div>
@@ -1096,7 +1096,7 @@
                     </a-popover>
                     <!-- <div class="certificateMorebox">
                     更多
-                   
+
                   </div> -->
                   </div>
                 </div>
@@ -1540,6 +1540,7 @@
         v-model:Lvisible="Lvisible"
         v-model:chooseGroupId="chooseGroupId"
         v-model:chooseGroupName="chooseGroupName"
+        v-model:groupMemberCount="groupMemberCount"
         v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
@@ -2441,6 +2442,8 @@ export default {
       checkStuId: null, //要查看的学员id
       chooseGroupId: null, //选择的小组id
       chooseGroupName: null, //选择的小组名称
+      groupMemberCount: null, //选择的小组人数限制
+      groupMemberNUmber: null, //选择的小组人数合计
       morFaceT: false, //批量面授报名按钮
       faceArr: [], //任务大纲列表所有name
       action: null,
@@ -3151,11 +3154,14 @@ export default {
       console.log("facestudent", state.facestudent);
     };
     //面授学员的弹窗
-    const showMemberList = (id, name) => {
+    const showMemberList = (id, name, groupMemberCount) => {
+      debugger
       state.Lvisible = true;
       console.log("ssdsdsdsd", id);
       state.chooseGroupId = id;
       state.chooseGroupName = name;
+      state.groupMemberCount = groupMemberCount;
+      console.log("state.groupMemberCount", state.groupMemberCount);
     };
     //活动考勤的抽屉
     {