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

This commit is contained in:
joshen
2025-12-10 23:26:19 +08:00

View File

@@ -31,7 +31,10 @@
</div> </div>
<div class="col-md-12 send_btn"> <div class="col-md-12 send_btn">
<button <button
v-if="approvalResults == '1' || approvalResults == '4'" v-if="
(approvalResults == '1' || approvalResults == '4') &&
allowSelfRegistration
"
class="btn btn-default btn-lg send center-block start-btn" class="btn btn-default btn-lg send center-block start-btn"
:disabled="enrollLoading" :disabled="enrollLoading"
@click="handleEnrollClick" @click="handleEnrollClick"
@@ -88,6 +91,7 @@ export default {
userName: "", userName: "",
projectId: "", projectId: "",
approvalResults: 1, approvalResults: 1,
allowSelfRegistration: false,
processing: false, processing: false,
confirmBtnText: "确认", confirmBtnText: "确认",
infoConfirmDialogVisible: false, infoConfirmDialogVisible: false,
@@ -112,6 +116,7 @@ export default {
// 1报名失败、2审核中、3审核通过、4审核失败 // 1报名失败、2审核中、3审核通过、4审核失败
if (res.data.approvalResults) { if (res.data.approvalResults) {
this.approvalResults = res.data.approvalResults; this.approvalResults = res.data.approvalResults;
this.allowSelfRegistration = res.data.allowSelfRegistration;
if (res.data.approvalResults != 1) { if (res.data.approvalResults != 1) {
this.$router.push("/new-employee/study"); this.$router.push("/new-employee/study");
} }