diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index c54a446a..9f50804a 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -405,7 +405,9 @@ export default {
// this.$router.push("/new-employee/welcome");
const res = await enrollRequest();
if (res.data.sendToOaSuccess != 0) {
- this.$refs.customMessage.show("报名失败,请联系XXXX,联系方式:XXXXXX");
+ this.$refs.customMessage.show(
+ "报名失败请稍后重试,如果再次失败,请联系:XXXX,联系方式:XXXX。"
+ );
} else {
this.$refs.customMessage.show("您已重新报名成功");
this.approvalResults = 2;
@@ -419,6 +421,7 @@ export default {
this.$refs.customMessage.show("未报名或报名失败,请前往报名页面进行报名");
this.$router.push("/new-employee/welcome");
}
+ this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
// 1报名失败、2审核中、3审核通过、4审核失败
this.approvalResults = res.data.approvalResults;
await this.initIds();
diff --git a/src/views/new-employee/WelcomePage.vue b/src/views/new-employee/WelcomePage.vue
index 37ad9cd3..eca61825 100644
--- a/src/views/new-employee/WelcomePage.vue
+++ b/src/views/new-employee/WelcomePage.vue
@@ -60,13 +60,13 @@
-
+ /> -->
@@ -109,6 +109,9 @@ export default {
// 1报名失败、2审核中、3审核通过、4审核失败
if (res.data.approvalResults) {
this.approvalResults = res.data.approvalResults;
+ if (res.data.approvalResults != 1) {
+ this.$router.push("/new-employee/study");
+ }
}
}
} catch (error) {
@@ -122,26 +125,26 @@ export default {
const res = await enrollRequest();
if (res.data.sendToOaSuccess != 0) {
this.$refs.customMessage.show(
- "报名失败,请联系XXXX,联系方式:XXXXXX"
+ "报名失败请稍后重试,如果再次失败,请联系:XXXX,联系方式:XXXX。"
);
return;
}
} else {
- this.infoConfirmDialogVisible = true;
+ this.$router.push("/new-employee/study?fromWelcome=1");
}
},
// 确认按钮
- async handleConfirm() {
- try {
- this.$router.push("/new-employee/study");
- } catch (error) {
- console.error("提交失败:", error);
- this.processing = false;
- this.confirmBtnText = "确认";
- this.$message.error("提交失败,请重试");
- }
- },
+ // async handleConfirm() {
+ // try {
+ // this.$router.push("/new-employee/study");
+ // } catch (error) {
+ // console.error("提交失败:", error);
+ // this.processing = false;
+ // this.confirmBtnText = "确认";
+ // this.$message.error("提交失败,请重试");
+ // }
+ // },
// 关闭对话框
handleDialogClose() {