hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 19:36:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee

Browse Source
This commit is contained in:
joshen
2025-11-17 18:23:21 +08:00
parent 6ab591a73c 0e80ff4df6
commit 0db4fe7c71
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/new-employee/StudyPage.vue
View File

@@ -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();

31
src/views/new-employee/WelcomePage.vue
View File

@@ -60,13 +60,13 @@
</div>
<!-- 学习引导页面 -->
<NewEmployeeGuideDialog
<!-- <NewEmployeeGuideDialog
:visible.sync="infoConfirmDialogVisible"
:processing="processing"
:onConfirm="handleConfirm"
:onCancel="() => (infoConfirmDialogVisible = false)"
@close="handleDialogClose"
/>
/> -->
<!-- 自定义信息提示 -->
<CustomInfoMessage ref="customMessage" />
</div>
@@ -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() {