diff --git a/src/components/CustomErrorMessage.vue b/src/components/CustomErrorMessage.vue
new file mode 100644
index 00000000..2d2fad0f
--- /dev/null
+++ b/src/components/CustomErrorMessage.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+ X
+
+
{{ message }}
+
+
+
+
+
+
+
+
diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index 00e4ea9e..c2f8dea1 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -234,6 +234,7 @@
+
@@ -252,6 +253,7 @@ import {
getSzxygProjectInfo,
enrollRequest,
} from "@/api/new-employee/newEmployee";
+import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
import { start } from "nprogress";
export default {
@@ -262,6 +264,7 @@ export default {
portalFloatTools,
NewEmployeeGuideDialog,
CustomInfoMessage,
+ CustomErrorMessage,
},
data() {
return {
@@ -402,16 +405,17 @@ export default {
}
},
async returnEnroll() {
- // this.$router.push("/new-employee/welcome");
- const res = await enrollRequest();
- if (res.data.sendToOaSuccess != 0) {
- this.$refs.customMessage.show(
- "报名失败请稍后重试,如果再次失败,请联系:XXXX,联系方式:XXXX。"
- );
- } else {
- this.$refs.customMessage.show("您已重新报名成功");
- this.approvalResults = 2;
- }
+ this.$confirm("请确认是否重新报名").then(async () => {
+ const res = await enrollRequest();
+ if (res.data.sendToOaSuccess != 0) {
+ this.$refs.errorMessage.show(
+ "报名失败请稍后重试,如果再次失败,请联系:XXXX,联系方式:XXXX。"
+ );
+ } else {
+ this.$refs.customMessage.show("您已重新报名成功");
+ this.approvalResults = 2;
+ }
+ });
},
},
async mounted() {
diff --git a/src/views/new-employee/WelcomePage.vue b/src/views/new-employee/WelcomePage.vue
index dc814f33..f2d4e6c4 100644
--- a/src/views/new-employee/WelcomePage.vue
+++ b/src/views/new-employee/WelcomePage.vue
@@ -70,7 +70,7 @@
@close="handleDialogClose"
/> -->
-
+
@@ -78,11 +78,11 @@
import { mapGetters } from "vuex";
import { getWelcomeData, enrollRequest } from "@/api/new-employee/newEmployee";
import NewEmployeeGuideDialog from "@/components/NewEmployeeGuideDialog.vue";
-import CustomInfoMessage from "@/components/CustomInfoMessage.vue";
+import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
export default {
name: "WelcomePage",
- components: { NewEmployeeGuideDialog, CustomInfoMessage },
+ components: { NewEmployeeGuideDialog, CustomErrorMessage },
data() {
return {
userName: "",