diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js index 611af42e6..a68f072fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollForm.js @@ -155,8 +155,10 @@ var bootstrap = function ($, learun) { }; scoreList.push(entity); }); + var entity = $('body').lrGetFormData(); + entity.MajorName = $('#MajorNo').lrselectGetText(); var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()), + strEntity: JSON.stringify(entity), scoreList: JSON.stringify(scoreList) }; $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollPhone/SaveForm?keyValue=' + keyValue, postData, function (res) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml index 8420fe5f1..2eeb225b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml @@ -120,9 +120,22 @@ // $('#StuMobile').val(StuMobile); var IsAdmission = data.StuEnroll.IsAdmission; + var majorName = ''; + //专业 + $.ajax({ + url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + '&where=' + "id='" + data.StuEnroll.MajorNo + "'", + async: false, + success: function (msg) { + var majorData = $.parseJSON(msg).data.data; + majorName = majorData[0].MajorName; + }, + }); + if (!majorName) { + majorName = data.StuEnroll.MajorName; + } if (IsAdmission == 1 || IsAdmission == true) { var major = data.StuEnroll.MajorName; - $('#IsAdmission').val('恭喜您,已被我校录取' + data.StuEnroll.MajorName + '专业'); + $('#IsAdmission').val('恭喜您,已被我校录取' + majorName + '专业'); //查询录取结果 $('#admmsg').show(); } else if (IsAdmission === false) {