Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210

src/components/PortalHeader.vue

@@ -426,11 +426,21 @@ export default {
       };
       window.open(obj[val]);
     },
-    handleCommand(val) {
+    async handleCommand(val) {
       if (val === "four") {
         window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
         // this.$emit('showClass',true)
       } else {
+        if (val === "five") {
+          // 从后端获取用户信息和报名状态
+          const res = await getWelcomeData();
+          if (res.status === 200 && res.data) {
+            if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+              this.$router.push("/new-employee/study");
+              return;
+            }
+          }
+        }
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {

src/layout/components/TopNav/Index.vue

@@ -422,6 +422,10 @@ export default {
       //   four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
       //   five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
       // };
+
+      if (val === "for") {
+        this.uClassShow = true;
+      } else {
         if (val === "five") {
           // 从后端获取用户信息和报名状态
           const res = await getWelcomeData();
@@ -432,9 +436,6 @@ export default {
             }
           }
         }
-      if (val === "for") {
-        this.uClassShow = true;
-      } else {
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {

src/views/new-employee/StudyPage.vue

@@ -128,7 +128,7 @@
               >转正攻略</el-button
             >
           </div>
-          <div>
+          <div v-if="bpmApprovalRequired">
             <div v-if="approvalResults == 2">
               <el-alert type="warning" center show-icon :closable="false">
                 <template slot="title">
@@ -160,7 +160,7 @@
               </el-alert>
             </div>
           </div>
-          <div style="text-align: center">
+          <div style="text-align: center" v-if="bpmApprovalRequired">
             <el-button type="text" @click="chartVisible = true"
               >转正流程示意图 ></el-button
             >
@@ -293,6 +293,7 @@ export default {
         4: "审核失败",
       },
       approvalResults: 1,
+      bpmApprovalRequired: 1,
     };
   },
   computed: {
@@ -413,6 +414,7 @@ export default {
     this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
     // 1报名失败、2审核中、3审核通过、4审核失败
     this.approvalResults = res.data.approvalResults;
+    this.bpmApprovalRequired = res.data.bpmApprovalRequired;
     await this.initIds();
     if (!this.projectId || !this.studentId) {
       this.$message.warning("未获得项目或学员信息，列表可能无法加载");