报到内容
- 是否完善个人信息未完善
+ 是否完善个人信息未完善
交档案状态未提交
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
index 47812bf6a..31c1e6f5d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js
@@ -19,7 +19,7 @@
$('#PayFeeStatus').html(entity.PayFeeStatus);
$('#CollectFileStatus').html(entity.CollectFileStatus);
$('#GetKeyStatus').html(entity.GetKeyStatus);
- $('#ClassTutorNo').html(entity.ClassTutorNo);
+ $('#IsCompleteInfo').html(entity.IsCompleteInfo);
$('#Dormitory').html(entity.DormitoryName);
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.css
new file mode 100644
index 000000000..13e08edde
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.css
@@ -0,0 +1,112 @@
+.enSecBox{
+ min-height: 100%;
+ background-color: #fff;
+}
+.ensTime{
+ position: relative;
+ text-align: center;
+ line-height: 24px;
+ font-size: 14px;
+ color: #B8E2FF;
+}
+.ensTime:after,.ensTime::before{
+ content: '';
+ width: .12rem;
+ height: .12rem;
+ background-color: #B8E2FF;
+ border-radius: 50%;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
+.ensTime:after{
+ right: 20%;
+}
+.ensTime::before{
+ left: 20%;
+}
+.ensHeader{
+ background-color: #0C86D8;
+ padding: .4rem 0;
+}
+.ensHeadT{
+ font-size: 18px;
+ color: #fff;
+ text-align: center;
+ margin-top: .3rem;
+}
+.ensSec1{
+ padding: 0 15px;
+}
+.eSec1Box{
+ position: relative;
+ margin-top: .4rem;
+}
+.eSec1Box:first-child{
+ margin-top: .2rem;
+}
+.sSecDown{
+ position: absolute;
+ width: .5rem;
+ left: 0;
+ right: 0;
+ top: -.08rem;
+ margin: auto;
+}
+.eSec1Top{
+ font-size: 14px;
+ font-weight: bold;
+ color: #ABDDFF;
+ font-style: italic;
+ padding-left: .35rem;
+}
+.eSec1Top span {
+ color: #0C86D8;
+ font-size: 20px;
+ margin-left: 5px;
+}
+.sSec1Con{
+ padding: .1rem .3rem .1rem .5rem;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: .2rem;
+}
+.sSec1Type1{
+ border: 2px solid #AEE8CF;
+ border-radius: .6rem;
+}
+.sSec1Type1 .sSec1State{
+ color: #12B215;
+}
+.sSec1Type2{
+ border: 2px solid #B8E2FF;
+ border-radius: .65rem;
+}
+.sSec1Type2 .sSec1State{
+ color: #17AAEE;
+}
+.sSec1Con > img{
+ width: .6rem;
+}
+.sSec1State{
+ font-size: 14px;
+}
+.sSec1Txt{
+ font-size: 16px;
+ text-align: center;
+ color: #1A1A1A;
+ margin: .1rem 0;
+}
+.sSec1Txt span{
+ display: block;
+ color: #9A9A9A;
+ margin-top: 2px;
+ font-size: 12px;
+}
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
new file mode 100644
index 000000000..0e901d528
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
@@ -0,0 +1,61 @@
+
+ /// 保存个人信息
+ ///
+ ///
+ /// ();
+
+ var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID);
+ entity.StudentLoan = model.StudentLoan;
+
+ stuInfoFreshIBLL.SaveEntity(entity.ID, entity);
+
+ return Success("保存成功");
+ }
+ ///
/// 头像
///
///
@@ -334,6 +359,10 @@ namespace Learun.Application.WebApi.Modules
///
public string Photo { get; set; }
///
+ /// 贷款回执码
+ ///
+ public string StudentLoan { get; set; }
+ ///
/// 家庭成员
///
public List StuInfoFreshFamilyEntities { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs
index 4c91ad5c4..0721aae25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs
@@ -652,6 +652,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[NotMapped]
public string ClassDiredctorNo { get; set; }
+ ///
+ /// 班主任名称
+ ///
+ [NotMapped]
+ public string ClassDiredctorName { get; set; }
+ ///
+ /// 班主任电话
+ ///
+ [NotMapped]
+ public string ClassDiredctorMobile { get; set; }
+ ///
+ /// 是否完善信息
+ ///
+ [NotMapped]
+ public string IsCompleteInfo { get; set; }
///
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
new file mode 100644
index 000000000..8aadd1a53
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
@@ -0,0 +1,83 @@
+(function () {
+ (function fontSize() {
+ var html = document.documentElement;
+ var windowWidth = html.clientWidth;
+ html.style.fontSize = 100 * (windowWidth / 750) + 'px';
+ })()
+ var page = {
+ isScroll: false,
+ init: function ($page) {
+ //ݰ
+ learun.layer.loading(true, 'ȡ');
+ learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+ if (data) {
+ for (var id in data) {
+ if (id == "StuInfoFreshEntity") {
+ //todo:
+ console.log(data[id].IsCompleteInfo == "");//false
+
+ if (data[id].IsCompleteInfo == "") {
+ completeStyle("#IsCompleteInfo", "images/enter1-1.png");
+ } else {
+ notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
+ }
+ if (data[id].PayFeeStatus == "ѽɷ") {
+ completeStyle("#PayFeeStatus", "images/enter1-2.png");
+ } else {
+ notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
+ }
+ if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) {
+ notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+ } else {
+ completeStyle("#StudentLoan", "images/enter1-3.png");
+ }
+ if (data[id].OnsitePayFeeStatus == "1") {
+ completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+ } else {
+ notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+ }
+ if (data[id].RegisterStatus == "1") {
+ completeStyle("#RegisterStatus", "images/enter1-5.png");
+ } else {
+ notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
+ }
+
+ }
+ }
+ page.bind($page);
+ learun.layer.loading(false);
+ }
+ });
+
+ //
+ $page.on('tap', '#IsCompleteInfo', function () {
+ learun.nav.go({ path: 'welcome', title: 'Ϣ', isBack: true, isHead: true, param: {}, type: 'right' });
+ });
+ $page.on('tap', '#RegisterStatus', function () {
+ learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: 'ɱά', isBack: true, isHead: true, param: {}, type: 'right' });
+ });
+ $page.on('tap', '#StudentLoan', function () {
+ learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: 'дִ', isBack: true, isHead: true, param: {}, type: 'right' });
+ });
+
+ },
+ bind: function ($page) {
+
+ }
+ };
+ //ʽ
+ var completeStyle = function (box, img) {
+ $(box).removeClass("sSec1Type2").addClass("sSec1Type1");
+ $(box).find(".sSec1State").html("");
+ $(box).find('img').attr("src", img);
+ };
+ //ʽ
+ var notCompleteStyle = function (box, img) {
+ $(box).removeClass("sSec1Type1").addClass("sSec1Type2");
+ $(box).find(".sSec1State").html("δ");
+ $(box).find('img').attr("src", img);
+
+ };
+
+ return page;
+})();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
index e5b7fde37..ee697bc2a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml
@@ -25,7 +25,7 @@
@* 缴费*@
线上缴费
取消线上缴费
- 助学贷款
+ 填写贷款回执码
现场缴费
其他费用缴费
取消其他费用缴费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index e2f0eb861..afd6ed3c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
@@ -175,7 +175,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
- { label: '助学贷款', name: 'StudentLoan', width: 130, align: "left" },
+ { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
{
label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
index da4439141..ccc41111f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs
@@ -18,8 +18,10 @@ namespace Learun.Application.WebApi.Modules
: base("/StuInfoFresh")
{
Get["/stuInfoFreshEntity"] = GetStuInfoFreshEntity;
+ Get["/stuInfoFresh"] = GetStuInfoFresh;
Get["/stuInfoFreshEntityByStuNo"] = GetStuInfoFreshEntityByStuNo;
Get["/saveStuInfoFresh"] = GetSaveStuInfoFresh;
+ Get["/saveLoan"] = GetSaveLoan;
Post["/savePhoto"] = GetSavePhoto;
Get["/payFeeDetail"] = GetPayFeeDetail;
@@ -49,20 +51,27 @@ namespace Learun.Application.WebApi.Modules
if (StuInfoFreshEntity != null)
{
//处理数据源
- StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo).MajorName;
- StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo).DeptName;
+ StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo)?.MajorName;
+ StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo)?.DeptName;
var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshEntity.ClassNo);
if (classInfoEntity != null)
{
StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName;
StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
+ StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
if (empInfoEntity != null)
{
StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
}
+ var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
+ if (empInfoEntity2 != null)
+ {
+ StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
+ StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
+ }
}
if (StuInfoFreshEntity.PayFeeStatus == "1")
{
@@ -103,7 +112,7 @@ namespace Learun.Application.WebApi.Modules
//是否完善信息
StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList();
StuInfoFreshEmergePeopleList = stuInfoFreshIBLL.GetStuInfoFreshEmergePeopleList(StuInfoFreshEntity.ID).ToList();
- StuInfoFreshEntity.ClassTutorNo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善";
+ StuInfoFreshEntity.IsCompleteInfo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善";
}
@@ -224,6 +233,22 @@ namespace Learun.Application.WebApi.Modules
return Success("保存成功");
}
///
+
+ 2020
+ 新生入校流程
+
+
+
+
+ step1
+
+ 
+
+
+
+ 完善学生信息
+
+ 已完成
+
+ 
+
+
+ step2
+
+ 
+
+
+
+ 线上缴费
+ ( 已缴费、未缴费 )
+
+ 未完成
+
+ 
+
+
+
+ 助学贷款
+ ( 填写贷款回执码 )
+
+ 已完成
+
+ 
+
+
+
+ 现场缴费
+ ( 已缴费、缓交、部分缴费、未缴费 )
+
+ 未完成
+
+
+
+
+ step3
+
+ 
+
+
+
+ 报到注册
+ ( 生成报到二维码，并显示报到教室 )
+
+ 未完成
+