Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/student/CommonStudent.vue

src/components/student/CommonStudent.vue

@@ -799,6 +799,11 @@ function handleStageOk() {
       let selectMember = 0;
       if (activeKey.value === 4) { // 项目内选人
         selectMember = selectsData.value.projectMemberList.length;
+        // 对选中的人员进行判断是否已经分组了
+        let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
+        if (haveGroupNum.length > 0) {
+          message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
+        }
       } else if (activeKey.value === 1) {
         selectMember = selectsData.value.studentList.length;
       } else if (activeKey.value === 2) {
@@ -814,11 +819,7 @@ function handleStageOk() {
       if (leaderArray.length > 0) {
         return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
       }
-      // 对选中的人员进行判断是否已经分组了
+
-      let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
-      if (haveGroupNum.length > 0) {
-        message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
-      }
     }
   }
   stageVisible.value = false;

src/views/examine/CourseReviewedN.vue

@@ -210,8 +210,8 @@
 						<div class="item" style="align-items: center;margin-top: 20px;">
 							<div class="left">审核结果：</div>
 							<div class="rig" style="margin-left: 10px;">
-								<a-tag v-if="transferCompletedModel.result==-1" color="red">拒绝</a-tag>
+								<a-tag v-if="transferCompletedModel.result=='审核拒绝'" color="red">拒绝</a-tag>
-    							<a-tag v-if="transferCompletedModel.result==2" color="green">通过</a-tag>
+    							<a-tag v-if="transferCompletedModel.result=='审核通过'" color="green">通过</a-tag>
 							</div>
 						</div>
 						<div class="item" style="margin-top: 20px">

src/views/learningpath/LevelAddDetail.vue

@@ -2172,5 +2172,6 @@ const cancelStorage = async () => {
 .footBox {
   position: fixed;
   bottom: 0;
+  z-index: 999;
 }
 </style>

src/views/projectcenter/TaskAdd.vue

@@ -1679,6 +1679,6 @@ const cancelStorage = async () => {
 .footBox {
   position: fixed;
   bottom: 0;
-  z-index: 99999;
+  z-index: 999;
 }
 </style>