Merge remote-tracking branch '121/test1024' into test1024

src/components/PortalHeader.vue

@@ -353,6 +353,14 @@ export default {
         this.keyword = newval;
       }
     },
+    "$route.query.keyword": {
+      handler(newval) {
+        if (newval && this.current == "case") {
+          this.keyword = newval;
+        }
+      },
+      immediate: true,
+    },
   },
   data() {
     return {

src/views/new-employee/StudyPage.vue

@@ -373,26 +373,6 @@ export default {
       );
     },
     async onDownload() {
-      // if (!this.projectId || !this.studentId) {
-      //   this.$message.warning("缺少项目信息或学员信息");
-      //   return;
-      // }
-      if (this.approvalResults != 2) {
-        // this.$refs.customMessage.show(
-        //   "您的报名正在审核中，无法下载成绩单，请审核通过后下载"
-        // );
-        return;
-      }
-      if (this.approvalResults != 4) {
-        // this.$refs.customMessage.show(
-        //   "请您重新报名，重新报名不影响当前学习进度，请在审核通过后下载成绩单"
-        // );
-        return;
-      }
-      if (this.progressRing.total != 100) {
-        // this.$message.warning("请您完成学习课程后下载成绩单");
-        return;
-      }
       try {
         const res = await downloadSocialRecruitReport(
           this.projectId,