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

src/components/student/CommonStudent.vue

@@ -27,7 +27,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetProjectStu" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetProjectStu" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -377,7 +377,10 @@ const stuTableRef = ref();
 const projectParams = ref({ pid: props.infoId, type: props.infoType });
 
 const getProjectStu = () => projectStuTableRef.value.fetch();
-const resetProjectStu = () => projectStuTableRef.value.reset();
+const resetProjectStu = () => {
+  projectParams.value.studentName = "";
+  projectStuTableRef.value.reset()
+};
 
 const person = ref(false);
 const group = ref(false);
@@ -541,6 +544,8 @@ const orgRowSelection = computed(() => ({
 
 const closeDrawer = () => {
   deleteDepSelect();
+  projectParams.value.studentName = "";
+  projectStuTableRef.value.reset();
   visiable.value = false;
   nameSearch.value.keyword = "";
   selectedOrgKeys.value = [];

src/views/learningpath/LevelAdd.vue

@@ -325,9 +325,9 @@
           <div style="flex: 1">
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <!-- <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
+              <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
                 <button class="btn">批量面授报名</button>
-              </ImpoterGroupLeader> -->
+              </ImpoterGroupLeader>
               <router-link
                 :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
                 class="editright"
@@ -1443,7 +1443,7 @@ import RouterHomeworkManage from "../../components/drawers/router/RouterHomework
 import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
 import RouterVoteManage from "../../components/drawers/router/RouterVoteManage";
 import RouterProjectManage from "../../components/drawers/router/RouterProjectManage";
-// import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue";
+import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 
 import { checkPer } from "@/utils/utils";
@@ -1451,7 +1451,7 @@ import { checkPer } from "@/utils/utils";
 export default {
   name: "LevelAdd",
   components: {
-    // ImpoterGroupLeader,
+    ImpoterGroupLeader,
     ProjectFaceTaskManage,
     ProjCheckShip,
     ImpStu,

src/views/projectcenter/TaskPage.vue

@@ -459,14 +459,14 @@
             <div class="split"></div>
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <!-- <ImpoterGroupLeader
+              <ImpoterGroupLeader
                 title="批量面授报名"
                 :data="{ targetId: projectId, type: 1 }"
                 :url="`/admin/offcourse/importCourse`"
                 :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`"
               >
                 <button class="btn">批量面授报名</button>
-              </ImpoterGroupLeader> -->
+              </ImpoterGroupLeader>
               <router-link
                 v-if="checkPer(permissions, createId)"
                 :to="{ path: `/taskadd`, query: { projectId: projectId } }"